-rw-r--r-- | qmake/include/qglobal.h | 165 |
1 files changed, 104 insertions, 61 deletions
diff --git a/qmake/include/qglobal.h b/qmake/include/qglobal.h index 94e5607..b7e919d 100644 --- a/qmake/include/qglobal.h +++ b/qmake/include/qglobal.h | |||
@@ -1,11 +1,11 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** $Id$ | 2 | ** |
3 | ** | 3 | ** |
4 | ** Global type declarations and definitions | 4 | ** Global type declarations and definitions |
5 | ** | 5 | ** |
6 | ** Created : 920529 | 6 | ** Created : 920529 |
7 | ** | 7 | ** |
8 | ** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. | 8 | ** Copyright (C) 1992-2003 Trolltech AS. All rights reserved. |
9 | ** | 9 | ** |
10 | ** This file is part of the tools module of the Qt GUI Toolkit. | 10 | ** This file is part of the tools module of the Qt GUI Toolkit. |
11 | ** | 11 | ** |
@@ -38,17 +38,18 @@ | |||
38 | #ifndef QGLOBAL_H | 38 | #ifndef QGLOBAL_H |
39 | #define QGLOBAL_H | 39 | #define QGLOBAL_H |
40 | 40 | ||
41 | #define QT_VERSION_STR "3.1.2" | 41 | #define QT_VERSION_STR "3.3.2" |
42 | /* | 42 | /* |
43 | QT_VERSION is (major << 16) + (minor << 8) + patch. | 43 | QT_VERSION is (major << 16) + (minor << 8) + patch. |
44 | */ | 44 | */ |
45 | #define QT_VERSION 0x030102 | 45 | #define QT_VERSION 0x030302 |
46 | 46 | ||
47 | /* | 47 | /* |
48 | The operating system, must be one of: (Q_OS_x) | 48 | The operating system, must be one of: (Q_OS_x) |
49 | 49 | ||
50 | MACX- Mac OS X | 50 | MACX- Mac OS X |
51 | MAC9- Mac OS 9 | 51 | MAC9- Mac OS 9 |
52 | DARWIN - Darwin OS (Without Mac OS X) | ||
52 | MSDOS- MS-DOS and Windows | 53 | MSDOS- MS-DOS and Windows |
53 | OS2- OS/2 | 54 | OS2- OS/2 |
54 | OS2EMX- XFree86 on OS/2 (not PM) | 55 | OS2EMX- XFree86 on OS/2 (not PM) |
@@ -78,7 +79,9 @@ | |||
78 | UNIX- Any UNIX BSD/SYSV system | 79 | UNIX- Any UNIX BSD/SYSV system |
79 | */ | 80 | */ |
80 | 81 | ||
81 | #if defined(__APPLE__) && defined(__GNUC__) | 82 | #if defined(__DARWIN_X11__) |
83 | # define Q_OS_DARWIN | ||
84 | #elif defined(__APPLE__) && defined(__GNUC__) | ||
82 | # define Q_OS_MACX | 85 | # define Q_OS_MACX |
83 | #elif defined(__MACOSX__) | 86 | #elif defined(__MACOSX__) |
84 | # define Q_OS_MACX | 87 | # define Q_OS_MACX |
@@ -111,7 +114,7 @@ | |||
111 | # define Q_OS_RELIANT | 114 | # define Q_OS_RELIANT |
112 | #elif defined(__linux__) || defined(__linux) | 115 | #elif defined(__linux__) || defined(__linux) |
113 | # define Q_OS_LINUX | 116 | # define Q_OS_LINUX |
114 | #elif defined(__FreeBSD__) | 117 | #elif defined(__FreeBSD__) || defined(__DragonFly__) |
115 | # define Q_OS_FREEBSD | 118 | # define Q_OS_FREEBSD |
116 | # define Q_OS_BSD4 | 119 | # define Q_OS_BSD4 |
117 | #elif defined(__NetBSD__) | 120 | #elif defined(__NetBSD__) |
@@ -149,22 +152,20 @@ | |||
149 | #elif defined(__svr4__) && defined(i386) /* Open UNIX 8 + GCC */ | 152 | #elif defined(__svr4__) && defined(i386) /* Open UNIX 8 + GCC */ |
150 | # define Q_OS_UNIXWARE | 153 | # define Q_OS_UNIXWARE |
151 | # define Q_OS_UNIXWARE7 | 154 | # define Q_OS_UNIXWARE7 |
155 | #elif defined(__MAKEDEPEND__) | ||
152 | #else | 156 | #else |
153 | # error "Qt has not been ported to this OS - talk to qt-bugs@trolltech.com" | 157 | # error "Qt has not been ported to this OS - talk to qt-bugs@trolltech.com" |
154 | #endif | 158 | #endif |
155 | 159 | ||
160 | #if defined(Q_OS_WIN32) || defined(Q_OS_WIN64) | ||
161 | # define Q_OS_WIN | ||
162 | #endif | ||
163 | |||
156 | #if defined(Q_OS_MAC9) || defined(Q_OS_MACX) | 164 | #if defined(Q_OS_MAC9) || defined(Q_OS_MACX) |
157 | /* This hack forces the generater to compile qmake not for maxosx native. It is | 165 | # define Q_OS_MAC |
158 | * compiled for Linux and generates usual makefiles.. | ||
159 | * Does anyone has a better solution for this ? (eilers) | ||
160 | */ | ||
161 | // # define Q_OS_MAC | ||
162 | #define Q_OS_LINUX | ||
163 | #warning "boeser Hack !! (se)" | ||
164 | #undef Q_OS_MACX | ||
165 | #endif | 166 | #endif |
166 | 167 | ||
167 | #if defined(Q_OS_MAC9) || defined(Q_OS_MSDOS) || defined(Q_OS_OS2) || defined(Q_OS_WIN32) || defined(Q_OS_WIN64) | 168 | #if defined(Q_OS_MAC9) || defined(Q_OS_MSDOS) || defined(Q_OS_OS2) || defined(Q_OS_WIN) |
168 | # undef Q_OS_UNIX | 169 | # undef Q_OS_UNIX |
169 | #elif !defined(Q_OS_UNIX) | 170 | #elif !defined(Q_OS_UNIX) |
170 | # define Q_OS_UNIX | 171 | # define Q_OS_UNIX |
@@ -177,7 +178,7 @@ | |||
177 | SYM- Symantec C++ for both PC and Macintosh | 178 | SYM- Symantec C++ for both PC and Macintosh |
178 | MPW- MPW C++ | 179 | MPW- MPW C++ |
179 | MWERKS- Metrowerks CodeWarrior | 180 | MWERKS- Metrowerks CodeWarrior |
180 | MSVC- Microsoft Visual C/C++ | 181 | MSVC- Microsoft Visual C/C++, Intel C++ for Windows |
181 | BOR- Borland/Turbo C++ | 182 | BOR- Borland/Turbo C++ |
182 | WAT- Watcom C++ | 183 | WAT- Watcom C++ |
183 | GNU- GNU C++ | 184 | GNU- GNU C++ |
@@ -192,7 +193,7 @@ | |||
192 | USLC- SCO OUDK, UDK, and UnixWare 2.X C++ | 193 | USLC- SCO OUDK, UDK, and UnixWare 2.X C++ |
193 | CDS- Reliant C++ | 194 | CDS- Reliant C++ |
194 | KAI- KAI C++ | 195 | KAI- KAI C++ |
195 | INTEL- Intel C++ | 196 | INTEL- Intel C++ for Linux, Intel C++ for Windows |
196 | HIGHC- MetaWare High C/C++ | 197 | HIGHC- MetaWare High C/C++ |
197 | PGI- Portland Group C++ | 198 | PGI- Portland Group C++ |
198 | GHS- Green Hills Optimizing C++ Compilers | 199 | GHS- Green Hills Optimizing C++ Compilers |
@@ -222,7 +223,6 @@ | |||
222 | # define Q_CC_MWERKS | 223 | # define Q_CC_MWERKS |
223 | /* "explicit" recognized since 4.0d1 */ | 224 | /* "explicit" recognized since 4.0d1 */ |
224 | # define QMAC_PASCAL pascal | 225 | # define QMAC_PASCAL pascal |
225 | # define Q_NO_USING_KEYWORD /* ### check "using" status */ | ||
226 | 226 | ||
227 | #elif defined(_MSC_VER) | 227 | #elif defined(_MSC_VER) |
228 | # define Q_CC_MSVC | 228 | # define Q_CC_MSVC |
@@ -232,11 +232,19 @@ | |||
232 | /* Visual C++.Net issues for _MSC_VER >= 1300 */ | 232 | /* Visual C++.Net issues for _MSC_VER >= 1300 */ |
233 | # if _MSC_VER >= 1300 | 233 | # if _MSC_VER >= 1300 |
234 | # define Q_CC_MSVC_NET | 234 | # define Q_CC_MSVC_NET |
235 | # if _MSC_VER < 1310 | 235 | # if _MSC_VER < 1310 || defined(Q_OS_WIN64) |
236 | # define Q_TYPENAME | 236 | # define Q_TYPENAME |
237 | # endif | 237 | # endif |
238 | # endif | 238 | # endif |
239 | # define Q_NO_USING_KEYWORD /* ### check "using" status */ | 239 | /* Intel C++ disguising as Visual C++: the `using' keyword avoids warnings */ |
240 | # if defined(__INTEL_COMPILER) | ||
241 | # define Q_CC_INTEL | ||
242 | # if !defined(__EXCEPTIONS) | ||
243 | # define Q_NO_EXCEPTIONS | ||
244 | # endif | ||
245 | # else | ||
246 | # define Q_NO_USING_KEYWORD /* ### check "using" status */ | ||
247 | # endif | ||
240 | 248 | ||
241 | #elif defined(__BORLANDC__) || defined(__TURBOC__) | 249 | #elif defined(__BORLANDC__) || defined(__TURBOC__) |
242 | # define Q_CC_BOR | 250 | # define Q_CC_BOR |
@@ -284,8 +292,17 @@ | |||
284 | # if defined(Q_OS_HPUX) && __GNUC__ == 3 && __GNUC_MINOR__ >= 1 | 292 | # if defined(Q_OS_HPUX) && __GNUC__ == 3 && __GNUC_MINOR__ >= 1 |
285 | # define Q_WRONG_SB_CTYPE_MACROS | 293 | # define Q_WRONG_SB_CTYPE_MACROS |
286 | # endif | 294 | # endif |
295 | |||
296 | /* ARM gcc pads structs to 32 bits, even when they contain a single | ||
297 | char, or short. We tell gcc to pack QChars to 16 bits, to avoid | ||
298 | QString bloat. However, gcc 3.4 doesn't allow us to create references to | ||
299 | members of a packed struct. (Pointers are OK, because then you | ||
300 | supposedly know what you are doing.) */ | ||
287 | # if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP) | 301 | # if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP) |
288 | # define Q_PACKED __attribute__ ((packed)) | 302 | # define Q_PACKED __attribute__ ((packed)) |
303 | # if __GNUC__ == 3 && __GNUC_MINOR__ >= 4 | ||
304 | # define Q_NO_PACKED_REFERENCE | ||
305 | # endif | ||
289 | # endif | 306 | # endif |
290 | # if !defined(__EXCEPTIONS) | 307 | # if !defined(__EXCEPTIONS) |
291 | # define Q_NO_EXCEPTIONS | 308 | # define Q_NO_EXCEPTIONS |
@@ -305,6 +322,8 @@ | |||
305 | Visual Age C++ 4.0 ... | 322 | Visual Age C++ 4.0 ... |
306 | ... ... | 323 | ... ... |
307 | Visual Age C++ 5.0 C Compiler 5.0 | 324 | Visual Age C++ 5.0 C Compiler 5.0 |
325 | ... ... | ||
326 | Visual Age C++ 6.0 C Compiler 6.0 | ||
308 | 327 | ||
309 | Now: | 328 | Now: |
310 | __xlC__ is the version of the C compiler in hexadecimal notation | 329 | __xlC__ is the version of the C compiler in hexadecimal notation |
@@ -329,7 +348,7 @@ | |||
329 | Compaq C++ V6.3-002. | 348 | Compaq C++ V6.3-002. |
330 | This compiler is different enough from other EDG compilers to handle | 349 | This compiler is different enough from other EDG compilers to handle |
331 | it separately anyway. */ | 350 | it separately anyway. */ |
332 | #elif defined(__DECCXX) | 351 | #elif defined(__DECCXX) || defined(__DECC) |
333 | # define Q_CC_DEC | 352 | # define Q_CC_DEC |
334 | /* Compaq C++ V6 compilers are EDG-based but I'm not sure about older | 353 | /* Compaq C++ V6 compilers are EDG-based but I'm not sure about older |
335 | DEC C++ V5 compilers. */ | 354 | DEC C++ V5 compilers. */ |
@@ -370,19 +389,23 @@ | |||
370 | # define Q_NO_BOOL_TYPE | 389 | # define Q_NO_BOOL_TYPE |
371 | # endif | 390 | # endif |
372 | 391 | ||
373 | /* The Portland Group compiler is based on EDG and does define __EDG__ */ | 392 | /* The Comeau compiler is based on EDG and does define __EDG__ */ |
374 | # if defined(__COMO__) | 393 | # if defined(__COMO__) |
375 | # define Q_CC_COMEAU | 394 | # define Q_CC_COMEAU |
376 | # define Q_C_CALLBACKS | 395 | # define Q_C_CALLBACKS |
377 | 396 | ||
378 | /* Using the `using' keyword avoids KAI C++ warnings */ | 397 | /* The `using' keyword was introduced to avoid KAI C++ warnings |
398 | but it's now causing KAI C++ errors instead. The standard is | ||
399 | unclear about the use of this keyword, and in practice every | ||
400 | compiler is using its own set of rules. Forget it. */ | ||
379 | # elif defined(__KCC) | 401 | # elif defined(__KCC) |
380 | # define Q_CC_KAI | 402 | # define Q_CC_KAI |
381 | # if !defined(_EXCEPTIONS) | 403 | # if !defined(_EXCEPTIONS) |
382 | # define Q_NO_EXCEPTIONS | 404 | # define Q_NO_EXCEPTIONS |
383 | # endif | 405 | # endif |
406 | # define Q_NO_USING_KEYWORD | ||
384 | 407 | ||
385 | /* Using the `using' keyword avoids Intel C++ warnings */ | 408 | /* Using the `using' keyword avoids Intel C++ for Linux warnings */ |
386 | # elif defined(__INTEL_COMPILER) | 409 | # elif defined(__INTEL_COMPILER) |
387 | # define Q_CC_INTEL | 410 | # define Q_CC_INTEL |
388 | # if !defined(__EXCEPTIONS) | 411 | # if !defined(__EXCEPTIONS) |
@@ -430,7 +453,6 @@ | |||
430 | # if defined(_MIPS_SIM) && (_MIPS_SIM == _ABIO32) /* o32 ABI */ | 453 | # if defined(_MIPS_SIM) && (_MIPS_SIM == _ABIO32) /* o32 ABI */ |
431 | # define Q_TYPENAME | 454 | # define Q_TYPENAME |
432 | # define Q_BROKEN_TEMPLATE_SPECIALIZATION | 455 | # define Q_BROKEN_TEMPLATE_SPECIALIZATION |
433 | # define Q_STRICT_INLINING_RULES | ||
434 | # define Q_NO_EXPLICIT_KEYWORD | 456 | # define Q_NO_EXPLICIT_KEYWORD |
435 | # define Q_INLINE_TEMPLATES inline | 457 | # define Q_INLINE_TEMPLATES inline |
436 | # elif defined(_COMPILER_VERSION) && (_COMPILER_VERSION < 730) /* 7.2 */ | 458 | # elif defined(_COMPILER_VERSION) && (_COMPILER_VERSION < 730) /* 7.2 */ |
@@ -438,6 +460,9 @@ | |||
438 | # define Q_BROKEN_TEMPLATE_SPECIALIZATION | 460 | # define Q_BROKEN_TEMPLATE_SPECIALIZATION |
439 | # endif | 461 | # endif |
440 | # define Q_NO_USING_KEYWORD /* ### check "using" status */ | 462 | # define Q_NO_USING_KEYWORD /* ### check "using" status */ |
463 | # if defined(_COMPILER_VERSION) && (_COMPILER_VERSION >= 740) | ||
464 | # pragma set woff 3624,3625, 3649 /* turn off some harmless warnings */ | ||
465 | # endif | ||
441 | # endif | 466 | # endif |
442 | 467 | ||
443 | /* The older UnixWare 2.X compiler? */ | 468 | /* The older UnixWare 2.X compiler? */ |
@@ -453,7 +478,7 @@ | |||
453 | #elif defined(__HIGHC__) | 478 | #elif defined(__HIGHC__) |
454 | # define Q_CC_HIGHC | 479 | # define Q_CC_HIGHC |
455 | 480 | ||
456 | #elif defined(__SUNPRO_CC) | 481 | #elif defined(__SUNPRO_CC) || defined(__SUNPRO_C) |
457 | # define Q_CC_SUN | 482 | # define Q_CC_SUN |
458 | /* 5.0 compiler or better | 483 | /* 5.0 compiler or better |
459 | 'bool' is enabled by default but can be disabled using -features=nobool | 484 | 'bool' is enabled by default but can be disabled using -features=nobool |
@@ -605,6 +630,13 @@ const bool true = TRUE; | |||
605 | # endif | 630 | # endif |
606 | #endif | 631 | #endif |
607 | 632 | ||
633 | // | ||
634 | // Proper for-scoping | ||
635 | // ### turn on in 4.0 | ||
636 | |||
637 | #if 0 && defined(Q_CC_MSVC) && !defined(Q_CC_MSVC_NET) | ||
638 | # define for if(0){}else for | ||
639 | #endif | ||
608 | 640 | ||
609 | // | 641 | // |
610 | // Use the "explicit" keyword on platforms that support it. | 642 | // Use the "explicit" keyword on platforms that support it. |
@@ -665,26 +697,31 @@ typedef unsigned short Q_UINT16; // 16 bit unsigned | |||
665 | typedef int Q_INT32;// 32 bit signed | 697 | typedef int Q_INT32;// 32 bit signed |
666 | typedef unsigned int Q_UINT32;// 32 bit unsigned | 698 | typedef unsigned int Q_UINT32;// 32 bit unsigned |
667 | #if defined(Q_OS_WIN64) | 699 | #if defined(Q_OS_WIN64) |
668 | // LLP64 64-bit model on Windows | ||
669 | typedef __int64 Q_LONG; // word up to 64 bit signed | 700 | typedef __int64 Q_LONG; // word up to 64 bit signed |
670 | typedef unsigned __int64 Q_ULONG;// word up to 64 bit unsigned | 701 | typedef unsigned __int64 Q_ULONG;// word up to 64 bit unsigned |
671 | #else | 702 | #else |
672 | // LP64 64-bit model on Linux | 703 | typedef long Q_LONG; // word up to 64 bit signed |
673 | typedef long Q_LONG; | 704 | typedef unsigned long Q_ULONG;// word up to 64 bit unsigned |
674 | typedef unsigned long Q_ULONG; | ||
675 | #endif | 705 | #endif |
676 | 706 | #if defined(Q_OS_WIN) && !defined(Q_CC_GNU) | |
677 | #if !defined(QT_CLEAN_NAMESPACE) | 707 | # define Q_INT64_C(c) c ## i64// signed 64 bit constant |
678 | // mininum size of 64 bits is not guaranteed | 708 | # define Q_UINT64_C(c) c ## ui64// unsigned 64 bit constant |
679 | #define Q_INT64 Q_LONG | 709 | typedef __int64 Q_INT64;// 64 bit signed |
680 | #define Q_UINT64 Q_ULONG | 710 | typedef unsigned __int64 Q_UINT64;// 64 bit unsigned |
711 | #else | ||
712 | # define Q_INT64_C(c) c ## LL // signed 64 bit constant | ||
713 | # define Q_UINT64_C(c) c ## ULL// unsigned 64 bit constant | ||
714 | typedef long long Q_INT64;// 64 bit signed | ||
715 | typedef unsigned long long Q_UINT64;// 64 bit unsigned | ||
681 | #endif | 716 | #endif |
717 | typedef Q_INT64 Q_LLONG;// signed long long | ||
718 | typedef Q_UINT64 Q_ULLONG;// unsigned long long | ||
682 | 719 | ||
683 | #if defined(Q_OS_MACX) && !defined(QT_LARGEFILE_SUPPORT) | 720 | #if defined(Q_OS_MACX) && !defined(QT_LARGEFILE_SUPPORT) |
684 | # define QT_LARGEFILE_SUPPORT 64 | 721 | # define QT_LARGEFILE_SUPPORT 64 |
685 | #endif | 722 | #endif |
686 | #if defined(QT_LARGEFILE_SUPPORT) | 723 | #if defined(QT_LARGEFILE_SUPPORT) |
687 | typedef unsigned long long QtOffset; | 724 | typedef Q_ULLONG QtOffset; |
688 | #else | 725 | #else |
689 | typedef Q_ULONG QtOffset; | 726 | typedef Q_ULONG QtOffset; |
690 | #endif | 727 | #endif |
@@ -708,17 +745,17 @@ class QDataStream; | |||
708 | 745 | ||
709 | #if !defined(QT_MOC) | 746 | #if !defined(QT_MOC) |
710 | #if defined(QCONFIG_LOCAL) | 747 | #if defined(QCONFIG_LOCAL) |
711 | #include <qconfig-local.h> | 748 | #include "qconfig-local.h" |
712 | #elif defined(QCONFIG_MINIMAL) | 749 | #elif defined(QCONFIG_MINIMAL) |
713 | #include <qconfig-minimal.h> | 750 | #include "qconfig-minimal.h" |
714 | #elif defined(QCONFIG_SMALL) | 751 | #elif defined(QCONFIG_SMALL) |
715 | #include <qconfig-small.h> | 752 | #include "qconfig-small.h" |
716 | #elif defined(QCONFIG_MEDIUM) | 753 | #elif defined(QCONFIG_MEDIUM) |
717 | #include <qconfig-medium.h> | 754 | #include "qconfig-medium.h" |
718 | #elif defined(QCONFIG_LARGE) | 755 | #elif defined(QCONFIG_LARGE) |
719 | #include <qconfig-large.h> | 756 | #include "qconfig-large.h" |
720 | #else // everything... | 757 | #else // everything... |
721 | #include <qconfig.h> | 758 | #include "qconfig.h" |
722 | #endif | 759 | #endif |
723 | #endif | 760 | #endif |
724 | 761 | ||
@@ -729,6 +766,9 @@ class QDataStream; | |||
729 | 766 | ||
730 | // prune to local config | 767 | // prune to local config |
731 | #include "qmodules.h" | 768 | #include "qmodules.h" |
769 | #ifndef QT_MODULE_DIALOGS | ||
770 | # define QT_NO_DIALOG | ||
771 | #endif | ||
732 | #ifndef QT_MODULE_ICONVIEW | 772 | #ifndef QT_MODULE_ICONVIEW |
733 | # define QT_NO_ICONVIEW | 773 | # define QT_NO_ICONVIEW |
734 | #endif | 774 | #endif |
@@ -781,8 +821,8 @@ class QDataStream; | |||
781 | #endif | 821 | #endif |
782 | 822 | ||
783 | #ifndef QT_H | 823 | #ifndef QT_H |
784 | #include <qfeatures.h> | 824 | #include "qfeatures.h" |
785 | #endif // QT_H | 825 | #endif /* QT_H */ |
786 | 826 | ||
787 | 827 | ||
788 | // | 828 | // |
@@ -790,7 +830,7 @@ class QDataStream; | |||
790 | // or QT_SHARED is defined (Kylix only) | 830 | // or QT_SHARED is defined (Kylix only) |
791 | // | 831 | // |
792 | 832 | ||
793 | #if defined(Q_OS_WIN32) || defined(Q_OS_WIN64) | 833 | #if defined(Q_OS_WIN) |
794 | # if defined(QT_NODLL) | 834 | # if defined(QT_NODLL) |
795 | # undef QT_MAKEDLL | 835 | # undef QT_MAKEDLL |
796 | # undef QT_DLL | 836 | # undef QT_DLL |
@@ -850,6 +890,7 @@ extern Q_EXPORT bool qt_winunicode; | |||
850 | 890 | ||
851 | Q_EXPORT const char *qVersion(); | 891 | Q_EXPORT const char *qVersion(); |
852 | Q_EXPORT bool qSysInfo( int *wordSize, bool *bigEndian ); | 892 | Q_EXPORT bool qSysInfo( int *wordSize, bool *bigEndian ); |
893 | Q_EXPORT bool qSharedBuild(); | ||
853 | #if defined(Q_OS_MAC) | 894 | #if defined(Q_OS_MAC) |
854 | int qMacVersion(); | 895 | int qMacVersion(); |
855 | #elif defined(Q_WS_WIN) | 896 | #elif defined(Q_WS_WIN) |
@@ -883,7 +924,6 @@ Q_EXPORT int qWinVersion(); | |||
883 | // | 924 | // |
884 | // Use to avoid "unused parameter" warnings | 925 | // Use to avoid "unused parameter" warnings |
885 | // | 926 | // |
886 | |||
887 | #define Q_UNUSED(x) (void)x; | 927 | #define Q_UNUSED(x) (void)x; |
888 | 928 | ||
889 | // | 929 | // |
@@ -1015,15 +1055,19 @@ Q_EXPORT const char *qInstallPathLibs(); | |||
1015 | Q_EXPORT const char *qInstallPathBins(); | 1055 | Q_EXPORT const char *qInstallPathBins(); |
1016 | Q_EXPORT const char *qInstallPathPlugins(); | 1056 | Q_EXPORT const char *qInstallPathPlugins(); |
1017 | Q_EXPORT const char *qInstallPathData(); | 1057 | Q_EXPORT const char *qInstallPathData(); |
1058 | Q_EXPORT const char *qInstallPathTranslations(); | ||
1059 | Q_EXPORT const char *qInstallPathSysconf(); | ||
1018 | 1060 | ||
1019 | #endif // __cplusplus | 1061 | #endif /* __cplusplus */ |
1020 | 1062 | ||
1021 | // compilers which follow outdated template instantiation rules | 1063 | /* |
1022 | // require a class to have a comparison operator to exist when | 1064 | compilers which follow outdated template instantiation rules |
1023 | // a QValueList of this type is instantiated. It's not actually | 1065 | require a class to have a comparison operator to exist when |
1024 | // used in the list, though. Hence the dummy implementation. | 1066 | a QValueList of this type is instantiated. It's not actually |
1025 | // Just in case other code relies on it we better trigger a warning | 1067 | used in the list, though. Hence the dummy implementation. |
1026 | // mandating a real implementation. | 1068 | Just in case other code relies on it we better trigger a warning |
1069 | mandating a real implementation. | ||
1070 | */ | ||
1027 | #ifdef Q_FULL_TEMPLATE_INSTANTIATION | 1071 | #ifdef Q_FULL_TEMPLATE_INSTANTIATION |
1028 | # define Q_DUMMY_COMPARISON_OPERATOR(C) \ | 1072 | # define Q_DUMMY_COMPARISON_OPERATOR(C) \ |
1029 | bool operator==( const C& ) const { \ | 1073 | bool operator==( const C& ) const { \ |
@@ -1034,13 +1078,13 @@ Q_EXPORT const char *qInstallPathData(); | |||
1034 | # define Q_DUMMY_COMPARISON_OPERATOR(C) | 1078 | # define Q_DUMMY_COMPARISON_OPERATOR(C) |
1035 | #endif | 1079 | #endif |
1036 | 1080 | ||
1037 | #endif // QGLOBAL_H | 1081 | #endif /* QGLOBAL_H */ |
1038 | 1082 | ||
1039 | // | 1083 | /* |
1040 | // Avoid some particularly useless warnings from some stupid compilers. | 1084 | Avoid some particularly useless warnings from some stupid compilers. |
1041 | // To get ALL C++ compiler warnings, define QT_CC_WARNINGS or comment out | 1085 | To get ALL C++ compiler warnings, define QT_CC_WARNINGS or comment out |
1042 | // the line "#define QT_NO_WARNINGS" | 1086 | the line "#define QT_NO_WARNINGS" |
1043 | // | 1087 | */ |
1044 | 1088 | ||
1045 | #if !defined(QT_CC_WARNINGS) | 1089 | #if !defined(QT_CC_WARNINGS) |
1046 | # define QT_NO_WARNINGS | 1090 | # define QT_NO_WARNINGS |
@@ -1066,7 +1110,6 @@ Q_EXPORT const char *qInstallPathData(); | |||
1066 | # pragma warn -ccc | 1110 | # pragma warn -ccc |
1067 | # pragma warn -rch | 1111 | # pragma warn -rch |
1068 | # pragma warn -sig | 1112 | # pragma warn -sig |
1069 | # elif defined(Q_CC_MWERKS) | ||
1070 | # pragma warn_possunwant off | ||
1071 | # endif | 1113 | # endif |
1072 | #endif | 1114 | #endif |
1115 | |||