From 4a3d2964a4fe06dd03be162b9ae6ea2f7edaa8ea Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 25 Apr 2013 20:04:04 +0200 Subject: adjust to new "configure -nomake tools" semantics this also reverts f47715f0a4 on the way, as this should make it obsolete. Change-Id: Ib54177b35f2378d7e6df497f546a8c4f19d00914 Reviewed-by: Joerg Bornemann --- tools/tools.pro | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/tools.pro b/tools/tools.pro index 5d3fa37b..f37bead6 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -1,2 +1,7 @@ TEMPLATE = subdirs -!ios: SUBDIRS += qml qmlplugindump +SUBDIRS += qml qmlplugindump + +qtNomakeTools( \ + qml \ + qmlplugindump \ +) -- cgit v1.2.3 From dfe77c25412eedcfecfd738904c2714c53d1e3bb Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 26 Apr 2013 15:08:16 +0200 Subject: make use of qt_app.prf Change-Id: Ibb906772daf7a6bc6d56874db0a4ced2cafa67a4 Reviewed-by: Joerg Bornemann --- tools/qml/qml.pro | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro index 80b1e19a..f9106876 100644 --- a/tools/qml/qml.pro +++ b/tools/qml/qml.pro @@ -1,6 +1,4 @@ -TEMPLATE = app CONFIG += uic declarative_debug declarative -DESTDIR = $$QT.declarative.bins include(qml.pri) @@ -8,9 +6,6 @@ SOURCES += main.cpp DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII -target.path = $$[QT_INSTALL_BINS] -INSTALLS += target - wince* { QT += xml @@ -35,3 +30,5 @@ mac { } else { TARGET=qmlviewer } + +load(qt_app) -- cgit v1.2.3