Fix checks for qt modules

The fix in 823d48d218 had a typo (Qt vs QT). Also fix other places where QT_CONFIG was used to identify Qt modules. Change-Id: Ie32b678b959f7b5573574ef87ae7ad92860e8323 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-26 15:58:20 +01:00
parent 823d48d218
commit d1aa986735
3 changed files with 3 additions and 3 deletions
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri
@@ -1,6 +1,6 @@

 QT += core gui widgets qml quick network v8
-contains (QT_CONFIG, webkit) {
+!isEmpty(QT.webkit.name) {
    QT += webkit
 }

--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -63,7 +63,7 @@ linux-* {

 include(../../qtcreator.pri)

-contains(QT_CONFIG, declarative)|!isEmpty(Qt.declarative.name) {
+contains(QT_CONFIG, declarative)|!isEmpty(QT.declarative.name) {
    SUBDIRS += \
            plugin_qmlprojectmanager \
            plugin_qmlprofiler
--- a/tests/manual/debugger/simple/simple_test_app.pro
+++ b/tests/manual/debugger/simple/simple_test_app.pro
@@ -10,7 +10,7 @@ QT += network
 QT += script
 QT += xml

-contains(QT_CONFIG, webkit) {
+contains(QT_CONFIG, webkit)|!isEmpty(QT.webkit.name) {
    QT += webkit
    greaterThan(QT_MAJOR_VERSION, 4) {
        QT += webkitwidgets