diff options
| -rw-r--r-- | qmake/generators/makefile.cpp | 6 | ||||
| -rw-r--r-- | qmake/generators/makefile.h | 2 | ||||
| -rw-r--r-- | qmake/generators/unix/unixmake.cpp | 16 |
3 files changed, 12 insertions, 12 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index a75149b926..3cac073d72 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -305,8 +305,8 @@ MakefileGenerator::setProjectFile(QMakeProject *p) project = p; if (project->isActiveConfig("win32")) target_mode = TARG_WIN_MODE; - else if (project->isActiveConfig("macx")) - target_mode = TARG_MACX_MODE; + else if (project->isActiveConfig("mac")) + target_mode = TARG_MAC_MODE; else target_mode = TARG_UNIX_MODE; init(); @@ -3236,7 +3236,7 @@ MakefileGenerator::writePkgConfigFile() t << "Libs: "; QString pkgConfiglibDir; QString pkgConfiglibName; - if (target_mode == TARG_MACX_MODE && project->isActiveConfig("lib_bundle")) { + if (target_mode == TARG_MAC_MODE && project->isActiveConfig("lib_bundle")) { pkgConfiglibDir = "-F${libdir}"; ProString bundle; if (!project->isEmpty("QMAKE_FRAMEWORK_BUNDLE_NAME")) diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h index 2f3e73ff6b..e1447c61c3 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -90,7 +90,7 @@ class MakefileGenerator : protected QMakeSourceFileInfo mutable QHash<ReplaceExtraCompilerCacheKey, QString> extraCompilerVariablesCache; protected: - enum TARG_MODE { TARG_UNIX_MODE, TARG_MACX_MODE, TARG_WIN_MODE } target_mode; + enum TARG_MODE { TARG_UNIX_MODE, TARG_MAC_MODE, TARG_WIN_MODE } target_mode; ProStringList createObjectList(const ProStringList &sources); diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index da0da53e05..7ebb397fba 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -493,7 +493,7 @@ UnixMakefileGenerator::findLibraries() } else { stub = opt.mid(2); } - } else if (target_mode == TARG_MACX_MODE && opt.startsWith("-framework")) { + } else if (target_mode == TARG_MAC_MODE && opt.startsWith("-framework")) { if (opt.length() == 10) ++it; // Skip @@ -607,11 +607,11 @@ UnixMakefileGenerator::processPrlFiles() break; } } - } else if (target_mode == TARG_MACX_MODE && opt.startsWith("-F")) { + } else if (target_mode == TARG_MAC_MODE && opt.startsWith("-F")) { QMakeLocalFileName f(opt.right(opt.length()-2)); if(!frameworkdirs.contains(f)) frameworkdirs.insert(fwidx++, f); - } else if (target_mode == TARG_MACX_MODE && opt.startsWith("-framework")) { + } else if (target_mode == TARG_MAC_MODE && opt.startsWith("-framework")) { if(opt.length() > 11) opt = opt.mid(11); else @@ -650,7 +650,7 @@ UnixMakefileGenerator::processPrlFiles() ProKey arch("default"); ProString opt = l.at(lit).trimmed(); if(opt.startsWith("-")) { - if (target_mode == TARG_MACX_MODE && opt.startsWith("-Xarch")) { + if (target_mode == TARG_MAC_MODE && opt.startsWith("-Xarch")) { if (opt.length() > 7) { arch = opt.mid(7).toKey(); opt = l.at(++lit); @@ -658,7 +658,7 @@ UnixMakefileGenerator::processPrlFiles() } if (opt.startsWith(libArg) || - (target_mode == TARG_MACX_MODE && opt.startsWith("-F"))) { + (target_mode == TARG_MAC_MODE && opt.startsWith("-F"))) { if(!lflags[arch].contains(opt)) lflags[arch].append(opt); } else if(opt.startsWith("-l") || opt == "-pthread") { @@ -666,12 +666,12 @@ UnixMakefileGenerator::processPrlFiles() if (lflags[arch].contains(opt)) lflags[arch].removeAll(opt); lflags[arch].append(opt); - } else if (target_mode == TARG_MACX_MODE && opt.startsWith("-framework")) { + } else if (target_mode == TARG_MAC_MODE && opt.startsWith("-framework")) { if(opt.length() > 11) opt = opt.mid(11); else { opt = l.at(++lit); - if (target_mode == TARG_MACX_MODE && opt.startsWith("-Xarch")) + if (target_mode == TARG_MAC_MODE && opt.startsWith("-Xarch")) opt = l.at(++lit); // The user has done the right thing and prefixed each part } bool found = false; @@ -833,7 +833,7 @@ UnixMakefileGenerator::defaultInstall(const QString &t) uninst.append("-$(DEL_FILE) \"" + dst_targ + "\""); if(!links.isEmpty()) { for(int i = 0; i < links.size(); ++i) { - if (target_mode == TARG_UNIX_MODE || target_mode == TARG_MACX_MODE) { + if (target_mode == TARG_UNIX_MODE || target_mode == TARG_MAC_MODE) { QString link = Option::fixPathToTargetOS(destdir + links[i], false); int lslash = link.lastIndexOf(Option::dir_sep); if(lslash != -1) |