diff options
| author | Harald Fernengel <harald@trolltech.com> | 2009-07-21 16:15:11 (GMT) |
|---|---|---|
| committer | Robert Griebl <rgriebl@trolltech.com> | 2009-07-29 08:55:02 (GMT) |
| commit | 2ce3e9c150798b12d5b434ed25fc37c96972fb8b (patch) | |
| tree | 64157ddd4daf2f7b70901afca52df6f02fe3cc72 /qmake/project.cpp | |
| parent | d7b688870aead912690188b324d370b920a7a600 (diff) | |
| download | Qt-2ce3e9c150798b12d5b434ed25fc37c96972fb8b.zip Qt-2ce3e9c150798b12d5b434ed25fc37c96972fb8b.tar.gz Qt-2ce3e9c150798b12d5b434ed25fc37c96972fb8b.tar.bz2 | |
Port of Qt to QNX
This makes Qt work on QNX 6.4.
* no q3support, no phonon
* no QSharedMemory, no QSystemSemaphore, no QProcess
Reviewed-By: Robert Griebl
Diffstat (limited to 'qmake/project.cpp')
| -rw-r--r-- | qmake/project.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index 704d8a6..4fefbab 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -623,10 +623,6 @@ QStringList qmake_feature_paths(QMakeProperty *prop=0) concat << base_concat + QDir::separator() + "mac"; concat << base_concat + QDir::separator() + "mac9"; break; - case Option::TARG_QNX6_MODE: //also a unix - concat << base_concat + QDir::separator() + "qnx6"; - concat << base_concat + QDir::separator() + "unix"; - break; } concat << base_concat; } @@ -1610,13 +1606,11 @@ QMakeProject::isActiveConfig(const QString &x, bool regex, QMap<QString, QString return false; //mkspecs - if((Option::target_mode == Option::TARG_MACX_MODE || Option::target_mode == Option::TARG_QNX6_MODE || + if((Option::target_mode == Option::TARG_MACX_MODE || Option::target_mode == Option::TARG_UNIX_MODE) && x == "unix") return true; else if(Option::target_mode == Option::TARG_MACX_MODE && x == "macx") return true; - else if(Option::target_mode == Option::TARG_QNX6_MODE && x == "qnx6") - return true; else if(Option::target_mode == Option::TARG_MAC9_MODE && x == "mac9") return true; else if((Option::target_mode == Option::TARG_MAC9_MODE || Option::target_mode == Option::TARG_MACX_MODE) && |