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
@@ -142,48 +142,56 @@
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++