summaryrefslogtreecommitdiffstats
path: root/qmake/generators/makefile.cpp
diff options
context:
space:
mode:
authorLaszlo Papp <lpapp@kde.org>2013-03-18 11:21:38 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-25 23:11:22 +0100
commitfff8b698ab50d84a9b3e37f087b075ea495b66c9 (patch)
tree7205f6bf5620c3e7e602fe2a48c7317087df569a /qmake/generators/makefile.cpp
parenta3c802e7e504be00fa5d25893bd967e6b628afc6 (diff)
Introduce QMAKE_CC_O_FLAG
This makes it possible to properly parametrize alternative compilers. Change-Id: Iaf0961c47875ee16d815356f36acf5652577cdca Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'qmake/generators/makefile.cpp')
-rw-r--r--qmake/generators/makefile.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 5a5f259358..69a8c809ac 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -442,6 +442,9 @@ MakefileGenerator::init()
}
}
+ if (v["QMAKE_CC_O_FLAG"].isEmpty())
+ v["QMAKE_CC_O_FLAG"].append("-o ");
+
if (v["QMAKE_LINK_O_FLAG"].isEmpty())
v["QMAKE_LINK_O_FLAG"].append("-o ");