diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-30 07:08:43 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-30 07:08:43 (GMT) |
| commit | f5acc7b83f79c0bce554a6e4fe2d9e6ebb4b582b (patch) | |
| tree | 865471e5d53175f66e5a8e13926285c289ca1437 /qmake/project.cpp | |
| parent | 0eaa3466077839b0cef2ad6c326d80f398eccae7 (diff) | |
| parent | c1a90a535206e0a146e13c60d981a855178e69ca (diff) | |
| download | Qt-f5acc7b83f79c0bce554a6e4fe2d9e6ebb4b582b.zip Qt-f5acc7b83f79c0bce554a6e4fe2d9e6ebb4b582b.tar.gz Qt-f5acc7b83f79c0bce554a6e4fe2d9e6ebb4b582b.tar.bz2 | |
Merge branch 'master' of git://git-nokia.trolltech.com.au/qtsoftware/qt/qt
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) && |