"export" the qml tools for qtPrepareTool() use

notably, this disables the build of qmlplugindumpd.exe under windows -
it is not clear to me why somebody would want to do that, as both sets
of libraries would be available, and the output from both variants should
be the same.

Change-Id: I95c77b2aa32f17f9d6df0e5d4b9d11f456d860f6
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

diff --git a/tools/qmlbundle/qmlbundle.pro b/tools/qmlbundle/qmlbundle.pro
index 6a89418..237f933 100644 (file)
--- a/tools/qmlbundle/qmlbundle.pro
+++ b/tools/qmlbundle/qmlbundle.pro
@@ -1,12 +1,7 @@
-TEMPLATE = app
-TARGET = qmlbundle
 DESTDIR= $$QT.qml.bins
 
 QT       = core qml-private v8-private core-private
-CONFIG  += console
-CONFIG  -= app_bundle
 
 SOURCES += main.cpp
 
-target.path = $$[QT_INSTALL_BINS]
-INSTALLS += target
+load(qt_tool)

diff --git a/tools/qmlmin/qmlmin.pro b/tools/qmlmin/qmlmin.pro
index c57ec29..c8df227 100644 (file)
--- a/tools/qmlmin/qmlmin.pro
+++ b/tools/qmlmin/qmlmin.pro
@@ -1,9 +1,5 @@
 QT       = core qmldevtools-private
-CONFIG  += console
-CONFIG  -= app_bundle
 DESTDIR  = $$QT.qml.bins
 SOURCES += main.cpp
 
-target.path = $$[QT_INSTALL_BINS]
-INSTALLS += target
-
+load(qt_tool)

diff --git a/tools/qmlplugindump/qmlplugindump.pro b/tools/qmlplugindump/qmlplugindump.pro
index 9cda825..0325630 100644 (file)
--- a/tools/qmlplugindump/qmlplugindump.pro
+++ b/tools/qmlplugindump/qmlplugindump.pro
@@ -1,11 +1,7 @@
-TEMPLATE = app
-CONFIG += qt uic console
 DESTDIR = $$QT.qml.bins
 
 QT += qml qml-private quick-private core-private
 
-TARGET = qmlplugindump
-
 SOURCES += \
     main.cpp \
     qmlstreamwriter.cpp
@@ -16,22 +12,4 @@ HEADERS += \
 OTHER_FILES += Info.plist
 macx: QMAKE_INFO_PLIST = Info.plist
 
-# Build debug and release versions of the tool on Windows -
-# if debug and release versions of Qt have been built.
-!build_pass:win32 {
-    CONFIG -= debug release debug_and_release build_all
-
-    contains(QT_CONFIG,debug):contains(QT_CONFIG,release) {
-        CONFIG += debug_and_release build_all
-        CONFIG(debug, debug|release) {
-           win32: TARGET = $$join(TARGET,,,d)
-        }
-    } else {
-        contains(QT_CONFIG,debug): CONFIG += debug
-        contains(QT_CONFIG,release): CONFIG += release
-    }
-}
-
-
-target.path = $$[QT_INSTALL_BINS]
-INSTALLS += target
+load(qt_tool)

diff --git a/tools/qmlprofiler/qmlprofiler.pro b/tools/qmlprofiler/qmlprofiler.pro
index 7ab61e7..70dc53b 100644 (file)
--- a/tools/qmlprofiler/qmlprofiler.pro
+++ b/tools/qmlprofiler/qmlprofiler.pro
@@ -1,16 +1,7 @@
-TEMPLATE = app
-TARGET   = qmlprofiler
 DESTDIR = $$QT.qml.bins
 
 QT += qml qml-private v8-private network core-private
 
-target.path = $$[QT_INSTALL_BINS]
-INSTALLS += target
-
-macx: CONFIG -= app_bundle
-
-CONFIG   += console
-
 SOURCES += main.cpp \
     qmlprofilerapplication.cpp \
     commandlistener.cpp \
@@ -28,3 +19,5 @@ HEADERS += \
     qmlprofilereventlocation.h \
     qqmldebugclient.h \
     qpacketprotocol.h
+
+load(qt_tool)

diff --git a/tools/qmlscene/qmlscene.pro b/tools/qmlscene/qmlscene.pro
index 1cf7b3c..0d41e1f 100644 (file)
--- a/tools/qmlscene/qmlscene.pro
+++ b/tools/qmlscene/qmlscene.pro
@@ -1,17 +1,10 @@
-TEMPLATE = app
-TARGET = qmlscene
 DESTDIR= $$QT.qml.bins
 
 QT += qml quick core-private
 !contains(QT_CONFIG, no-widgets):QT += widgets
 
-target.path = $$[QT_INSTALL_BINS]
-INSTALLS += target
-
-macx: CONFIG -= app_bundle
-
 SOURCES += main.cpp
 
-CONFIG += console
-
 DEFINES += QML_RUNTIME_TESTING QT_QML_DEBUG_NO_WARNING
+
+load(qt_tool)

diff --git a/tools/qmltestrunner/qmltestrunner.pro b/tools/qmltestrunner/qmltestrunner.pro
index a6c9533..efa0e96 100644 (file)
--- a/tools/qmltestrunner/qmltestrunner.pro
+++ b/tools/qmltestrunner/qmltestrunner.pro
@@ -1,13 +1,7 @@
-TEMPLATE = app
-TARGET = qmltestrunner
 DESTDIR= $$QT.qml.bins
-CONFIG += warn_on
-SOURCES += main.cpp
 
+SOURCES += main.cpp
 
 QT += qml qmltest
 
-macx: CONFIG -= app_bundle
-
-target.path = $$[QT_INSTALL_BINS]
-INSTALLS += target
+load(qt_tool)