summaryrefslogtreecommitdiff
path: root/qmake/include
authoreilers <eilers>2004-07-29 10:50:29 (UTC)
committer eilers <eilers>2004-07-29 10:50:29 (UTC)
commit9981eb853deaeac6ef5f87b94b60984450cb630a (patch) (side-by-side diff)
tree8888c220156b831a70d88ff6b64d8f76386ef9d1 /qmake/include
parent08d7594f45f24112f76192ddbcd8ed3f0a651186 (diff)
downloadopie-9981eb853deaeac6ef5f87b94b60984450cb630a.zip
opie-9981eb853deaeac6ef5f87b94b60984450cb630a.tar.gz
opie-9981eb853deaeac6ef5f87b94b60984450cb630a.tar.bz2
Reimplement fix to compile and work on MacOS-X.
Diffstat (limited to 'qmake/include') (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
@@ -154,24 +154,32 @@
# define Q_OS_UNIXWARE7
#elif defined(__MAKEDEPEND__)
#else
# error "Qt has not been ported to this OS - talk to qt-bugs@trolltech.com"
#endif
#if defined(Q_OS_WIN32) || defined(Q_OS_WIN64)
# define Q_OS_WIN
#endif
#if defined(Q_OS_MAC9) || defined(Q_OS_MACX)
# define Q_OS_MAC
+/* We have to prevent qmake to generate makefiles or projectfiles for the Apple build system.
+ * This would work if we would use QT3. But we compile with QT2 which don't use qmake and does nothing
+ * about the MAC platform !! (se)
+ */
+#warning "evil hack here !! (se)"
+#define Q_OS_LINUX
+#undef Q_OS_MACX
+#undef Q_OS_MAC
#endif
#if defined(Q_OS_MAC9) || defined(Q_OS_MSDOS) || defined(Q_OS_OS2) || defined(Q_OS_WIN)
# undef Q_OS_UNIX
#elif !defined(Q_OS_UNIX)
# define Q_OS_UNIX
#endif
/*
The compiler, must be one of: (Q_CC_x)