From 940f7c8744db8fe8b4002019550ca383a1cf5d3f Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 26 Apr 2013 14:15:34 +0200 Subject: split qt_app.prf out of qt_tool.prf this way we can use it for "regular" apps (gui tools) as well. Change-Id: I3b00d0bde215dff1c2726b35626c4c0c256d92c2 Reviewed-by: Joerg Bornemann --- mkspecs/features/qt_app.prf | 34 ++++++++++++++++++++++++++++++++++ mkspecs/features/qt_tool.prf | 23 +---------------------- 2 files changed, 35 insertions(+), 22 deletions(-) create mode 100644 mkspecs/features/qt_app.prf (limited to 'mkspecs/features') diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf new file mode 100644 index 0000000000..8758f4a9a0 --- /dev/null +++ b/mkspecs/features/qt_app.prf @@ -0,0 +1,34 @@ +# +# W A R N I N G +# ------------- +# +# This file is not part of the Qt API. It exists purely as an +# implementation detail. It may change from version to version +# without notice, or even be removed. +# +# We mean it. +# + +TEMPLATE = app + +load(qt_build_paths) +DESTDIR = $$MODULE_BASE_OUTDIR/bin + +isEmpty(QMAKE_INFO_PLIST): CONFIG -= app_bundle + +host_build: QT -= gui # no host tool will ever use gui +host_build:force_bootstrap { + !build_pass: CONFIG += release + contains(QT, core(-private)?|xml) { + QT -= core core-private xml + QT += bootstrap-private + } + target.path = $$[QT_HOST_BINS] +} else { + !build_pass:contains(QT_CONFIG, build_all): CONFIG += release + target.path = $$[QT_INSTALL_BINS] +} +INSTALLS += target + +load(qt_targets) +load(qt_common) diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf index 46d031fb32..0a588807c8 100644 --- a/mkspecs/features/qt_tool.prf +++ b/mkspecs/features/qt_tool.prf @@ -9,30 +9,9 @@ # We mean it. # -TEMPLATE = app - -load(qt_build_paths) -DESTDIR = $$MODULE_BASE_OUTDIR/bin +load(qt_app) CONFIG += console -isEmpty(QMAKE_INFO_PLIST): CONFIG -= app_bundle - -host_build: QT -= gui # no host tool will ever use gui -host_build:force_bootstrap { - !build_pass: CONFIG += release - contains(QT, core(-private)?|xml) { - QT -= core core-private xml - QT += bootstrap-private - } - target.path = $$[QT_HOST_BINS] -} else { - !build_pass:contains(QT_CONFIG, build_all): CONFIG += release - target.path = $$[QT_INSTALL_BINS] -} -INSTALLS += target - -load(qt_targets) -load(qt_common) # If we are doing a prefix build, create a "module" pri which enables # qtPrepareTool() to work with the non-installed build. -- cgit v1.2.3