QtTools: Replace CONFIG+=help by QT+=help

Change-Id: I2e195430241288cf6e9fc809d4a1b0d6b0e79314
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

8 files changed, 8 insertions, 15 deletions

diff --git a/examples/help/contextsensitivehelp/contextsensitivehelp.pro b/examples/help/contextsensitivehelp/contextsensitivehelp.pro
index 29686b67d..95df7d963 100644
--- a/examples/help/contextsensitivehelp/contextsensitivehelp.pro
+++ b/examples/help/contextsensitivehelp/contextsensitivehelp.pro
@@ -1,7 +1,6 @@
 TEMPLATE = app
 
-CONFIG += help
-QT     += widgets
+QT     += help widgets
 SOURCES += main.cpp \
            wateringconfigdialog.cpp \
            helpbrowser.cpp
diff --git a/src/assistant/qhelpconverter/qhelpconverter.pro b/src/assistant/qhelpconverter/qhelpconverter.pro
index 932562dce..b9b6a6310 100644
--- a/src/assistant/qhelpconverter/qhelpconverter.pro
+++ b/src/assistant/qhelpconverter/qhelpconverter.pro
@@ -2,7 +2,7 @@ QT += help widgets
 TEMPLATE = app
 TARGET = qhelpconverter
 DESTDIR = $$QT.help.bins
-CONFIG += qt warn_on help
+CONFIG += qt warn_on
 
 target.path=$$[QT_INSTALL_BINS]
 INSTALLS += target
diff --git a/src/assistant/qhelpgenerator/qhelpgenerator.pro b/src/assistant/qhelpgenerator/qhelpgenerator.pro
index f22ac708c..5e33268ca 100644
--- a/src/assistant/qhelpgenerator/qhelpgenerator.pro
+++ b/src/assistant/qhelpgenerator/qhelpgenerator.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET = qhelpgenerator
 DESTDIR = $$QT.help.bins
-CONFIG += qt warn_on help console
+CONFIG += qt warn_on console
 CONFIG -= app_bundle
 QT += network help-private
 
diff --git a/tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro b/tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro
index de46acc8b..4f7a21166 100644
--- a/tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro
+++ b/tests/auto/qhelpcontentmodel/qhelpcontentmodel.pro
@@ -1,10 +1,8 @@
 TARGET = tst_qhelpcontentmodel
 CONFIG += testcase
-QT += testlib
+QT += help testlib
 SOURCES += tst_qhelpcontentmodel.cpp
 
-CONFIG += help
-
 DEFINES += QT_USE_USING_NAMESPACE
 
 wince*: {   
diff --git a/tests/auto/qhelpenginecore/qhelpenginecore.pro b/tests/auto/qhelpenginecore/qhelpenginecore.pro
index 101489d72..5f84a8830 100644
--- a/tests/auto/qhelpenginecore/qhelpenginecore.pro
+++ b/tests/auto/qhelpenginecore/qhelpenginecore.pro
@@ -1,8 +1,7 @@
 TARGET = tst_qhelpenginecore
 CONFIG += testcase
 SOURCES += tst_qhelpenginecore.cpp
-CONFIG  += help
-QT      += sql testlib
+QT      += help sql testlib help
 
 
 DEFINES += QT_USE_USING_NAMESPACE
diff --git a/tests/auto/qhelpgenerator/qhelpgenerator.pro b/tests/auto/qhelpgenerator/qhelpgenerator.pro
index 4d70f44e2..c6fb2d3ea 100644
--- a/tests/auto/qhelpgenerator/qhelpgenerator.pro
+++ b/tests/auto/qhelpgenerator/qhelpgenerator.pro
@@ -2,8 +2,7 @@ TARGET = tst_qhelpgenerator
 CONFIG += testcase
 
 SOURCES += tst_qhelpgenerator.cpp
-CONFIG  += help
-QT      += sql testlib
+QT      += help sql testlib
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
 DEFINES += QT_USE_USING_NAMESPACE
diff --git a/tests/auto/qhelpindexmodel/qhelpindexmodel.pro b/tests/auto/qhelpindexmodel/qhelpindexmodel.pro
index eeb01dfd4..18c118f2d 100644
--- a/tests/auto/qhelpindexmodel/qhelpindexmodel.pro
+++ b/tests/auto/qhelpindexmodel/qhelpindexmodel.pro
@@ -2,8 +2,7 @@ TARGET = tst_qhelpindexmodel
 CONFIG += testcase
 
 SOURCES += tst_qhelpindexmodel.cpp
-CONFIG  += help
-QT      += sql testlib
+QT      += help sql testlib
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
 DEFINES += QT_USE_USING_NAMESPACE
diff --git a/tests/auto/qhelpprojectdata/qhelpprojectdata.pro b/tests/auto/qhelpprojectdata/qhelpprojectdata.pro
index 8630dc92b..3922e20ec 100644
--- a/tests/auto/qhelpprojectdata/qhelpprojectdata.pro
+++ b/tests/auto/qhelpprojectdata/qhelpprojectdata.pro
@@ -2,8 +2,7 @@ TARGET = tst_qhelpprojectdata
 CONFIG += testcase
 
 SOURCES += tst_qhelpprojectdata.cpp
-CONFIG  += help
-QT      += testlib
+QT      += help testlib
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
 DEFINES += QT_USE_USING_NAMESPACE