remove remainder of mac9 mode

Reviewed-by: mariusSO

5 files changed, 6 insertions, 24 deletions

diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 991e1ec..ae43e2b 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -2164,9 +2164,7 @@ QString MakefileGenerator::buildArgs(const QString &outdir)
         ret += " -nodependheuristics";
     if(!Option::mkfile::qmakespec_commandline.isEmpty())
         ret += " -spec " + specdir(outdir);
-    if(Option::target_mode == Option::TARG_MAC9_MODE)
-        ret += " -mac9";
-    else if(Option::target_mode == Option::TARG_MACX_MODE)
+    if(Option::target_mode == Option::TARG_MACX_MODE)
         ret += " -macx";
     else if(Option::target_mode == Option::TARG_UNIX_MODE)
         ret += " -unix";
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index f51c046..b2f0db1 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -778,10 +778,8 @@ UnixMakefileGenerator::defaultInstall(const QString &t)
             uninst.append("-$(DEL_FILE) \"" + dst_targ + "\"");
         if(!links.isEmpty()) {
             for(int i = 0; i < links.size(); ++i) {
-                if(Option::target_mode == Option::TARG_WIN_MODE ||
-                   Option::target_mode == Option::TARG_MAC9_MODE) {
-                } else if(Option::target_mode == Option::TARG_UNIX_MODE ||
-                          Option::target_mode == Option::TARG_MACX_MODE) {
+                if(Option::target_mode == Option::TARG_UNIX_MODE ||
+                   Option::target_mode == Option::TARG_MACX_MODE) {
                     QString link = Option::fixPathToTargetOS(destdir + links[i], false);
                     int lslash = link.lastIndexOf(Option::dir_sep);
                     if(lslash != -1)
diff --git a/qmake/option.cpp b/qmake/option.cpp
index 5e06721..18f0541 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -250,8 +250,6 @@ Option::parseCommandLine(int argc, char **argv, int skip)
                 Option::user_template = argv[++x];
             } else if(opt == "tp" || opt == "template_prefix") {
                 Option::user_template_prefix = argv[++x];
-            } else if(opt == "mac9") {
-                Option::target_mode = TARG_MAC9_MODE;
             } else if(opt == "macx") {
                 Option::target_mode = TARG_MACX_MODE;
             } else if(opt == "unix") {
@@ -532,10 +530,7 @@ Option::init(int argc, char **argv)
         Option::obj_ext = ".obj";
         Option::res_ext = ".res";
     } else {
-        if(Option::target_mode == Option::TARG_MAC9_MODE)
-            Option::dir_sep = ":";
-        else
-            Option::dir_sep = "/";
+        Option::dir_sep = "/";
         Option::obj_ext = ".o";
     }
     Option::qmake_abslocation = Option::fixPathToTargetOS(Option::qmake_abslocation);
diff --git a/qmake/option.h b/qmake/option.h
index fe9a4ef..514e442 100644
--- a/qmake/option.h
+++ b/qmake/option.h
@@ -150,7 +150,7 @@ struct Option
     static int warn_level;
     static bool recursive;
     static QStringList before_user_vars, after_user_vars, user_configs, after_user_configs;
-    enum TARG_MODE { TARG_UNIX_MODE, TARG_WIN_MODE, TARG_MACX_MODE, TARG_MAC9_MODE };
+    enum TARG_MODE { TARG_UNIX_MODE, TARG_WIN_MODE, TARG_MACX_MODE };
     static TARG_MODE target_mode;
     static QString user_template, user_template_prefix;
     static QStringList shellPath;
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();