From 62f661829b8e3067dc638c1e8f2dfaacb5dbf4e0 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Sun, 25 Jul 2010 18:06:41 +0000 Subject: Theme Editor: fix building on Windows. The imported qtfindreplacedialog assumes getting compiled as library. Including the files directly causes problems on Windows because of its __declspec() handling. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27559 a1c6a512-1295-4272-9138-f99709370657 --- utils/themeeditor/qtfindreplacedialog/findreplace_global.h | 4 ++++ utils/themeeditor/themeeditor.pro | 2 ++ 2 files changed, 6 insertions(+) diff --git a/utils/themeeditor/qtfindreplacedialog/findreplace_global.h b/utils/themeeditor/qtfindreplacedialog/findreplace_global.h index 4f8c1a7353..be71bff752 100644 --- a/utils/themeeditor/qtfindreplacedialog/findreplace_global.h +++ b/utils/themeeditor/qtfindreplacedialog/findreplace_global.h @@ -8,10 +8,14 @@ #include +#ifndef FINDREPLACE_NOLIB #if defined(FINDREPLACE_LIBRARY) # define FINDREPLACESHARED_EXPORT Q_DECL_EXPORT #else # define FINDREPLACESHARED_EXPORT Q_DECL_IMPORT #endif +#else +#define FINDREPLACESHARED_EXPORT +#endif #endif // FINDREPLACE_GLOBAL_H diff --git a/utils/themeeditor/themeeditor.pro b/utils/themeeditor/themeeditor.pro index 3d9ddca694..c7bde1fa1a 100644 --- a/utils/themeeditor/themeeditor.pro +++ b/utils/themeeditor/themeeditor.pro @@ -23,6 +23,8 @@ INCLUDEPATH += models INCLUDEPATH += graphics INCLUDEPATH += quazip INCLUDEPATH += qtfindreplacedialog + +DEFINES += FINDREPLACE_NOLIB cross { message("Crossbuilding for W32 binary") -- cgit v1.2.3