diff options
Diffstat (limited to 'qmake/generators/makefile.cpp')
| -rw-r--r-- | qmake/generators/makefile.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 55c819657a..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(); @@ -448,6 +448,9 @@ MakefileGenerator::init() if (chkglue.isEmpty()) // Backwards compat with Qt4 specs chkglue = isWindowsShell() ? "" : "|| "; + if (v["QMAKE_LINK_O_FLAG"].isEmpty()) + v["QMAKE_LINK_O_FLAG"].append("-o "); + ProStringList &quc = v["QMAKE_EXTRA_COMPILERS"]; //make sure the COMPILERS are in the correct input/output chain order @@ -3233,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")) |