From 503530a8fd1c02b01bf4df1af03b473f1852ec96 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 10 Jul 2012 20:53:52 +0200 Subject: support building tools as application bundles qmlplugindump needs that Change-Id: I3b6b6689a32744262184fa781fda465460a87640 Reviewed-by: Rohan McGovern --- mkspecs/features/qt_tool.prf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf index 134cb4ba84..48ce5b903b 100644 --- a/mkspecs/features/qt_tool.prf +++ b/mkspecs/features/qt_tool.prf @@ -1,7 +1,7 @@ TEMPLATE = app CONFIG += qt warn_on console -CONFIG -= app_bundle +isEmpty(QMAKE_INFO_PLIST): CONFIG -= app_bundle build_all:!build_pass { CONFIG -= build_all @@ -35,10 +35,12 @@ INSTALLS += target MODULE_BASE_OUTDIR = $$shadowed($$MODULE_BASE_DIR) isEmpty(MODULE_QMAKE_OUTDIR): MODULE_QMAKE_OUTDIR = $$MODULE_BASE_OUTDIR + load(resolve_target) + TOOL_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules/qt_$${MODULE}.pri TOOL_PRI_CONT = \ - "QT_TOOL.$${MODULE}.binary = $$absolute_path($$DESTDIR, $$OUT_PWD)/$$TARGET" \ + "QT_TOOL.$${MODULE}.binary = $$QMAKE_RESOLVED_TARGET" \ "QT_TOOL.$${MODULE}.depends =$$join(MODULE_DEPENDS, " ", " ")" write_file($$TOOL_PRI, TOOL_PRI_CONT)|error("Aborting.") -- cgit v1.2.3