| author | eilers <eilers> | 2004-07-29 10:50:29 (UTC) |
|---|---|---|
| committer | eilers <eilers> | 2004-07-29 10:50:29 (UTC) |
| commit | 9981eb853deaeac6ef5f87b94b60984450cb630a (patch) (unidiff) | |
| tree | 8888c220156b831a70d88ff6b64d8f76386ef9d1 /qmake | |
| parent | 08d7594f45f24112f76192ddbcd8ed3f0a651186 (diff) | |
| download | opie-9981eb853deaeac6ef5f87b94b60984450cb630a.zip opie-9981eb853deaeac6ef5f87b94b60984450cb630a.tar.gz opie-9981eb853deaeac6ef5f87b94b60984450cb630a.tar.bz2 | |
Reimplement fix to compile and work on MacOS-X.
| -rw-r--r-- | qmake/include/qglobal.h | 8 |
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 | |||
| @@ -163,6 +163,14 @@ | |||
| 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) |