diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2012-09-17 16:10:42 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-17 18:42:15 +0200 |
| commit | e48c9c0f641dd9e7b5ee308a6bbda518c42fcd55 (patch) | |
| tree | 88974c05787b933d00893f798769eb76cacea8fd /tools | |
| parent | aa6d27f043f0367ea4c16bb255f65b2a6abb5921 (diff) | |
Compile & install qmlplugindump by default (again)
qmlplugindump is still needed for QtQUick1 modules, since the one in
qtdeclarative will choke on the QtQuick1 dependency. Therefore revive
qmlplugindump in here, but name it qml1plugindump.
Change-Id: I975621cff4758ab71e165eb3f6398d70a1f154be
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmlplugindump/qmlplugindump.pro | 30 | ||||
| -rw-r--r-- | tools/tools.pro | 2 |
2 files changed, 5 insertions, 27 deletions
diff --git a/tools/qmlplugindump/qmlplugindump.pro b/tools/qmlplugindump/qmlplugindump.pro index e8b5fac0..53d202e7 100644 --- a/tools/qmlplugindump/qmlplugindump.pro +++ b/tools/qmlplugindump/qmlplugindump.pro @@ -1,11 +1,7 @@ -TEMPLATE = app -CONFIG += qt uic console -DESTDIR = $$QT.declarative.bins +DESTDIR = $$QT.quick1.bins +TARGET = qml1plugindump -QT += quick1 quick1-private core-private -!isEmpty(QT.widgets.name): QT += gui gui-private widgets widgets-private - -TARGET = qmlplugindump +QT += core-private quick1-private SOURCES += \ main.cpp \ @@ -17,22 +13,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 - } else { - contains(QT_CONFIG,debug): CONFIG += debug - contains(QT_CONFIG,release): CONFIG += release - } -} - -CONFIG(debug, debug|release) { - win32: TARGET = $$join(TARGET,,,d) -} - -target.path = $$[QT_INSTALL_BINS] -INSTALLS += target +load(qt_tool) diff --git a/tools/tools.pro b/tools/tools.pro index f17f4cb5..02a1e201 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -1,2 +1,2 @@ TEMPLATE = subdirs -SUBDIRS += qml +SUBDIRS += qml qmlplugindump |