diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-12-09 09:17:48 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-02-12 15:48:09 (GMT) |
| commit | dcdab4f3a6b943b54b630dd25827a444b6331e92 (patch) | |
| tree | b8de52898d1782ceec9afb907791d9ea7bf3b351 /qmake/project.cpp | |
| parent | de8bbaab5b8d85243d3d18c642faef3a826ca672 (diff) | |
| download | Qt-dcdab4f3a6b943b54b630dd25827a444b6331e92.zip Qt-dcdab4f3a6b943b54b630dd25827a444b6331e92.tar.gz Qt-dcdab4f3a6b943b54b630dd25827a444b6331e92.tar.bz2 | |
remove remainder of mac9 mode
Reviewed-by: mariusSO
Diffstat (limited to 'qmake/project.cpp')
| -rw-r--r-- | qmake/project.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index 04951c3..8871152 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -610,10 +610,6 @@ QStringList qmake_feature_paths(QMakeProperty *prop=0) concat << base_concat + QDir::separator() + "win32"; break; } - case Option::TARG_MAC9_MODE: - concat << base_concat + QDir::separator() + "mac"; - concat << base_concat + QDir::separator() + "mac9"; - break; } concat << base_concat; } @@ -1612,12 +1608,7 @@ QMakeProject::isActiveConfig(const QString &x, bool regex, QMap<QString, QString if((Option::target_mode == Option::TARG_MACX_MODE || Option::target_mode == Option::TARG_UNIX_MODE) && x == "unix") return !isForSymbian(); - else if(Option::target_mode == Option::TARG_MACX_MODE && x == "macx") - return !isForSymbian(); - else if(Option::target_mode == Option::TARG_MAC9_MODE && x == "mac9") - return !isForSymbian(); - else if((Option::target_mode == Option::TARG_MAC9_MODE || Option::target_mode == Option::TARG_MACX_MODE) && - x == "mac") + else if(Option::target_mode == Option::TARG_MACX_MODE && (x == "macx" || x == "mac")) return !isForSymbian(); else if(Option::target_mode == Option::TARG_WIN_MODE && x == "win32") return !isForSymbian(); |