diff options
author | Morten Johan Sørvig <morten.sorvig@digia.com> | 2013-03-06 14:53:36 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-06 19:03:21 +0100 |
commit | c6a689f64fa4d2db55206ef7d63baebdf4c7befd (patch) | |
tree | fb189a2b34861e13d63224bd56f1c4ecc8fbf55f /qmake/generators/unix | |
parent | 6c55e553075816f6980cfa59d8e405650cebb3a5 (diff) |
Make .prl file generation work for iOS again.
d28073d9 creates a distinction between "mac" and
"macx". The latter is not set on iOS, which caused
MakefileGenerator::target_mode to be set to TARG_UNIX_MODE.
Check for the "mac" active config instead of "macx".
Rename TARG_MACX_MODE -> TARG_MAC_MODE.
Change-Id: I7192788c33f5723034ba76da2492379dd454f0ab
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'qmake/generators/unix')
-rw-r--r-- | qmake/generators/unix/unixmake.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
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) |