-rw-r--r-- | library/backend/qpcglobal.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/library/backend/qpcglobal.h b/library/backend/qpcglobal.h index 0d60272..7b71f06 100644 --- a/library/backend/qpcglobal.h +++ b/library/backend/qpcglobal.h | |||
@@ -1,12 +1,12 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** Licensees holding valid Qtopia Developer license may use this | 6 | ** Licensees holding valid Qtopia Developer license may use this |
7 | ** file in accordance with the Qtopia Developer License Agreement | 7 | ** file in accordance with the Qtopia Developer License Agreement |
8 | ** provided with the Software. | 8 | ** provided with the Software. |
9 | ** | 9 | ** |
10 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING | 10 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING |
11 | ** THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 11 | ** THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
12 | ** PURPOSE. | 12 | ** PURPOSE. |
@@ -17,30 +17,33 @@ | |||
17 | ** Contact info@trolltech.com if any conditions of this licensing are | 17 | ** Contact info@trolltech.com if any conditions of this licensing are |
18 | ** not clear to you. | 18 | ** not clear to you. |
19 | ** | 19 | ** |
20 | **********************************************************************/ | 20 | **********************************************************************/ |
21 | 21 | ||
22 | #ifndef QPC_GLOBAL_H | 22 | #ifndef QPC_GLOBAL_H |
23 | #define QPC_GLOBAL_H | 23 | #define QPC_GLOBAL_H |
24 | 24 | ||
25 | #if ( defined(Q_OS_WIN32) || defined(Q_OS_WIN64) ) && defined(PALMTOPCENTER) | ||
26 | #include <qglobal.h> | 25 | #include <qglobal.h> |
26 | |||
27 | #if ( defined(Q_OS_WIN32) || defined(Q_OS_WIN64) ) && defined(PALMTOPCENTER) | ||
27 | // # if defined(QT_NODLL) | 28 | // # if defined(QT_NODLL) |
28 | //# undef QPC_MAKEDLL | 29 | //# undef QPC_MAKEDLL |
29 | //# undef QPC_DLL | 30 | //# undef QPC_DLL |
30 | # if defined(QPC_MAKEDLL)/* create a Qt DLL library */ | 31 | # if defined(QPC_MAKEDLL)/* create a Qt DLL library */ |
31 | # if defined(QPC_DLL) | 32 | # if defined(QPC_DLL) |
32 | # undef QPC_DLL | 33 | # undef QPC_DLL |
33 | # endif | 34 | # endif |
34 | # define QPC_EXPORT __declspec(dllexport) | 35 | # define QPC_EXPORT __declspec(dllexport) |
36 | # define QPC_TEMPLATEEXTERN | ||
35 | # define QPC_TEMPLATEDLL | 37 | # define QPC_TEMPLATEDLL |
36 | # undef QPC_DISABLE_COPY/* avoid unresolved externals */ | 38 | # undef QPC_DISABLE_COPY/* avoid unresolved externals */ |
37 | # elif defined(QPC_DLL) /* use a Qt DLL library */ | 39 | # elif defined(QPC_DLL) /* use a Qt DLL library */ |
38 | # define QPC_EXPORT __declspec(dllimport) | 40 | # define QPC_EXPORT __declspec(dllimport) |
41 | # define QPC_TEMPLATEEXTERN extern | ||
39 | # define QPC_TEMPLATEDLL | 42 | # define QPC_TEMPLATEDLL |
40 | # undef QPC_DISABLE_COPY/* avoid unresolved externals */ | 43 | # undef QPC_DISABLE_COPY/* avoid unresolved externals */ |
41 | # endif | 44 | # endif |
42 | #else | 45 | #else |
43 | # undef QPC_MAKEDLL /* ignore these for other platforms */ | 46 | # undef QPC_MAKEDLL /* ignore these for other platforms */ |
44 | # undef QPC_DLL | 47 | # undef QPC_DLL |
45 | #endif | 48 | #endif |
46 | #endif | 49 | #endif |