From 25113852e985b5eec04947af2d12efe149051c92 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 29 Jun 2012 14:40:24 +0200 Subject: [PATCH] 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 --- src/plugins/accessible/quick/quick.pro | 6 +++--- src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro | 3 +-- 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 aec1f92..25a3cc0 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 60f5e0b..44efc12 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 0f4272e..fbc4c88 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 \ -- 1.7.2.5