summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--qmake/include/qglobal.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/qmake/include/qglobal.h b/qmake/include/qglobal.h
index b7e919d..ce209fe 100644
--- a/qmake/include/qglobal.h
+++ b/qmake/include/qglobal.h
@@ -118,96 +118,104 @@
118# define Q_OS_FREEBSD 118# define Q_OS_FREEBSD
119# define Q_OS_BSD4 119# define Q_OS_BSD4
120#elif defined(__NetBSD__) 120#elif defined(__NetBSD__)
121# define Q_OS_NETBSD 121# define Q_OS_NETBSD
122# define Q_OS_BSD4 122# define Q_OS_BSD4
123#elif defined(__OpenBSD__) 123#elif defined(__OpenBSD__)
124# define Q_OS_OPENBSD 124# define Q_OS_OPENBSD
125# define Q_OS_BSD4 125# define Q_OS_BSD4
126#elif defined(__bsdi__) 126#elif defined(__bsdi__)
127# define Q_OS_BSDI 127# define Q_OS_BSDI
128# define Q_OS_BSD4 128# define Q_OS_BSD4
129#elif defined(__sgi) 129#elif defined(__sgi)
130# define Q_OS_IRIX 130# define Q_OS_IRIX
131#elif defined(__osf__) 131#elif defined(__osf__)
132# define Q_OS_OSF 132# define Q_OS_OSF
133#elif defined(_AIX) 133#elif defined(_AIX)
134# define Q_OS_AIX 134# define Q_OS_AIX
135#elif defined(__Lynx__) 135#elif defined(__Lynx__)
136# define Q_OS_LYNX 136# define Q_OS_LYNX
137#elif defined(__GNU_HURD__) 137#elif defined(__GNU_HURD__)
138# define Q_OS_HURD 138# define Q_OS_HURD
139#elif defined(__DGUX__) 139#elif defined(__DGUX__)
140# define Q_OS_DGUX 140# define Q_OS_DGUX
141#elif defined(__QNXNTO__) 141#elif defined(__QNXNTO__)
142# define Q_OS_QNX6 142# define Q_OS_QNX6
143#elif defined(__QNX__) 143#elif defined(__QNX__)
144# define Q_OS_QNX 144# define Q_OS_QNX
145#elif defined(_SEQUENT_) 145#elif defined(_SEQUENT_)
146# define Q_OS_DYNIX 146# define Q_OS_DYNIX
147#elif defined(_SCO_DS) /* SCO OpenServer 5 + GCC */ 147#elif defined(_SCO_DS) /* SCO OpenServer 5 + GCC */
148# define Q_OS_SCO 148# define Q_OS_SCO
149#elif defined(__USLC__) /* all SCO platforms + UDK or OUDK */ 149#elif defined(__USLC__) /* all SCO platforms + UDK or OUDK */
150# define Q_OS_UNIXWARE 150# define Q_OS_UNIXWARE
151# define Q_OS_UNIXWARE7 151# define Q_OS_UNIXWARE7
152#elif defined(__svr4__) && defined(i386) /* Open UNIX 8 + GCC */ 152#elif defined(__svr4__) && defined(i386) /* Open UNIX 8 + GCC */
153# define Q_OS_UNIXWARE 153# define Q_OS_UNIXWARE
154# define Q_OS_UNIXWARE7 154# define Q_OS_UNIXWARE7
155#elif defined(__MAKEDEPEND__) 155#elif defined(__MAKEDEPEND__)
156#else 156#else
157# 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"
158#endif 158#endif
159 159
160#if defined(Q_OS_WIN32) || defined(Q_OS_WIN64) 160#if defined(Q_OS_WIN32) || defined(Q_OS_WIN64)
161# define Q_OS_WIN 161# define Q_OS_WIN
162#endif 162#endif
163 163
164#if defined(Q_OS_MAC9) || defined(Q_OS_MACX) 164#if defined(Q_OS_MAC9) || defined(Q_OS_MACX)
165# define Q_OS_MAC 165# define Q_OS_MAC
166/* We have to prevent qmake to generate makefiles or projectfiles for the Apple build system.
167 * This would work if we would use QT3. But we compile with QT2 which don't use qmake and does nothing
168 * about the MAC platform !! (se)
169 */
170#warning "evil hack here !! (se)"
171#define Q_OS_LINUX
172#undef Q_OS_MACX
173#undef Q_OS_MAC
166#endif 174#endif
167 175
168#if defined(Q_OS_MAC9) || defined(Q_OS_MSDOS) || defined(Q_OS_OS2) || defined(Q_OS_WIN) 176#if defined(Q_OS_MAC9) || defined(Q_OS_MSDOS) || defined(Q_OS_OS2) || defined(Q_OS_WIN)
169# undef Q_OS_UNIX 177# undef Q_OS_UNIX
170#elif !defined(Q_OS_UNIX) 178#elif !defined(Q_OS_UNIX)
171# define Q_OS_UNIX 179# define Q_OS_UNIX
172#endif 180#endif
173 181
174 182
175/* 183/*
176 The compiler, must be one of: (Q_CC_x) 184 The compiler, must be one of: (Q_CC_x)
177 185
178 SYM- Symantec C++ for both PC and Macintosh 186 SYM- Symantec C++ for both PC and Macintosh
179 MPW- MPW C++ 187 MPW- MPW C++
180 MWERKS- Metrowerks CodeWarrior 188 MWERKS- Metrowerks CodeWarrior
181 MSVC- Microsoft Visual C/C++, Intel C++ for Windows 189 MSVC- Microsoft Visual C/C++, Intel C++ for Windows
182 BOR- Borland/Turbo C++ 190 BOR- Borland/Turbo C++
183 WAT- Watcom C++ 191 WAT- Watcom C++
184 GNU- GNU C++ 192 GNU- GNU C++
185 COMEAU- Comeau C++ 193 COMEAU- Comeau C++
186 EDG- Edison Design Group C++ 194 EDG- Edison Design Group C++
187 OC - CenterLine C++ 195 OC - CenterLine C++
188 SUN- Sun WorkShop, Forte Developer, or Sun ONE Studio C++ 196 SUN- Sun WorkShop, Forte Developer, or Sun ONE Studio C++
189 MIPS- MIPSpro C++ 197 MIPS- MIPSpro C++
190 DEC- DEC C++ 198 DEC- DEC C++
191 HP - HPUX C++ 199 HP - HPUX C++
192 HPACC- HPUX ANSI C++ 200 HPACC- HPUX ANSI C++
193 USLC- SCO OUDK, UDK, and UnixWare 2.X C++ 201 USLC- SCO OUDK, UDK, and UnixWare 2.X C++
194 CDS- Reliant C++ 202 CDS- Reliant C++
195 KAI- KAI C++ 203 KAI- KAI C++
196 INTEL- Intel C++ for Linux, Intel C++ for Windows 204 INTEL- Intel C++ for Linux, Intel C++ for Windows
197 HIGHC- MetaWare High C/C++ 205 HIGHC- MetaWare High C/C++
198 PGI- Portland Group C++ 206 PGI- Portland Group C++
199 GHS- Green Hills Optimizing C++ Compilers 207 GHS- Green Hills Optimizing C++ Compilers
200 208
201 Should be sorted most to least authoritative. 209 Should be sorted most to least authoritative.
202*/ 210*/
203 211
204/* Symantec C++ is now Digital Mars */ 212/* Symantec C++ is now Digital Mars */
205#if defined(__DMC__) || defined(__SC__) 213#if defined(__DMC__) || defined(__SC__)
206# define Q_CC_SYM 214# define Q_CC_SYM
207/* "explicit" semantics implemented in 8.1e but keyword recognized since 7.5 */ 215/* "explicit" semantics implemented in 8.1e but keyword recognized since 7.5 */
208# if defined(__SC__) && __SC__ < 0x750 216# if defined(__SC__) && __SC__ < 0x750
209# define Q_NO_EXPLICIT_KEYWORD 217# define Q_NO_EXPLICIT_KEYWORD
210# endif 218# endif
211# define Q_NO_USING_KEYWORD 219# define Q_NO_USING_KEYWORD
212# if !defined(_CPPUNWIND) 220# if !defined(_CPPUNWIND)
213# define Q_NO_EXCEPTIONS 221# define Q_NO_EXCEPTIONS