summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2010-07-25 18:06:41 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2010-07-25 18:06:41 +0000
commit62f661829b8e3067dc638c1e8f2dfaacb5dbf4e0 (patch)
tree850970366a8ac968665fe2b844c814eed057b120
parent4e8ef935097cc0571e0eb6e34071753dbb763cfc (diff)
downloadrockbox-62f661829b8e3067dc638c1e8f2dfaacb5dbf4e0.tar.gz
rockbox-62f661829b8e3067dc638c1e8f2dfaacb5dbf4e0.zip
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
-rw-r--r--utils/themeeditor/qtfindreplacedialog/findreplace_global.h4
-rw-r--r--utils/themeeditor/themeeditor.pro2
2 files changed, 6 insertions, 0 deletions
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 @@
8 8
9#include <QtCore/qglobal.h> 9#include <QtCore/qglobal.h>
10 10
11#ifndef FINDREPLACE_NOLIB
11#if defined(FINDREPLACE_LIBRARY) 12#if defined(FINDREPLACE_LIBRARY)
12# define FINDREPLACESHARED_EXPORT Q_DECL_EXPORT 13# define FINDREPLACESHARED_EXPORT Q_DECL_EXPORT
13#else 14#else
14# define FINDREPLACESHARED_EXPORT Q_DECL_IMPORT 15# define FINDREPLACESHARED_EXPORT Q_DECL_IMPORT
15#endif 16#endif
17#else
18#define FINDREPLACESHARED_EXPORT
19#endif
16 20
17#endif // FINDREPLACE_GLOBAL_H 21#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
23INCLUDEPATH += graphics 23INCLUDEPATH += graphics
24INCLUDEPATH += quazip 24INCLUDEPATH += quazip
25INCLUDEPATH += qtfindreplacedialog 25INCLUDEPATH += qtfindreplacedialog
26
27DEFINES += FINDREPLACE_NOLIB
26cross { 28cross {
27 message("Crossbuilding for W32 binary") 29 message("Crossbuilding for W32 binary")
28 30