diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-29 14:40:24 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-29 15:01:10 +0200 |
commit | 25113852e985b5eec04947af2d12efe149051c92 (patch) | |
tree | 9fbb266aa1d3da455b54ee5dd09a4b300d21158d /src/plugins | |
parent | 1398d616754a2dd1618a2b31a43a86cc078af8a2 (diff) |
remove stale references to QTDIR_build
after the buildsystem changes, qtbase's .qmake.cache is not longer
included by other modules, thus the QTDIR_build condition will now never
trigger, causing various breakages.
and as nowadays modules can be build as part of qt or standalone without
any changes, the conditon makes no sense to start with.
Change-Id: I4a2ed6153577b6d064ab0dc407ce99f31b1263ac
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/accessible/quick/quick.pro | 6 | ||||
-rw-r--r-- | src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro | 3 | ||||
-rw-r--r-- | src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro | 1 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/plugins/accessible/quick/quick.pro b/src/plugins/accessible/quick/quick.pro index aec1f924be..25a3cc0e2a 100644 --- a/src/plugins/accessible/quick/quick.pro +++ b/src/plugins/accessible/quick/quick.pro @@ -1,13 +1,13 @@ contains(QT_CONFIG, accessibility) { TARGET = qtaccessiblequick +DESTDIR = $$QT.gui.plugins/accessible + load(qt_plugin) include ($$PWD/../shared/qaccessiblebase.pri) QT += core-private gui-private v8-private qml-private quick-private -QTDIR_build:DESTDIR = $$QT.gui.plugins/accessible - -QTDIR_build:REQUIRES += "contains(QT_CONFIG, accessibility)" +REQUIRES += "contains(QT_CONFIG, accessibility)" #DEFINES+=Q_ACCESSIBLE_QUICK_ITEM_ENABLE_DEBUG_DESCRIPTION diff --git a/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro b/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro index 60f5e0b856..44efc12673 100644 --- a/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro +++ b/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro @@ -3,8 +3,7 @@ QT += qml network load(qt_plugin) -QTDIR_build:DESTDIR = $$QT.qml.plugins/qmltooling -QTDIR_build:REQUIRES += "contains(QT_CONFIG, qml)" +DESTDIR = $$QT.qml.plugins/qmltooling SOURCES += \ qmlostplugin.cpp \ diff --git a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro index 0f4272e26c..fbc4c88a10 100644 --- a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro +++ b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro @@ -6,7 +6,6 @@ QT += qml-private network v8-private core-private load(qt_plugin) DESTDIR = $$QT.qml.plugins/qmltooling -QTDIR_build:REQUIRES += "contains(QT_CONFIG, qml)" SOURCES += \ qtcpserverconnection.cpp \ |