diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-31 13:48:47 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-31 13:48:47 +0200 |
| commit | 12dc36cb4bd03065098fd9836b87132760151a90 (patch) | |
| tree | 79280b395bd26be8ec39ba8115fce293e03eafe6 | |
| parent | 430629ef7581b4b38ac2ecd83a82df2ade708e54 (diff) | |
| parent | dfe77c25412eedcfecfd738904c2714c53d1e3bb (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I5c5246ef6c3028118bac4f3d19fdfda5bd52799d
| -rw-r--r-- | tools/qml/qml.pro | 7 | ||||
| -rw-r--r-- | tools/tools.pro | 7 |
2 files changed, 8 insertions, 6 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) 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 \ +) |