From 112f80c6c679ce2b4cf69b31f4f8f14bf3d82f38 Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@digia.com>
Date: Tue, 23 Oct 2012 11:44:35 +0200
Subject: [PATCH] Qt5: Fix warning "qtestlib is deprecated".

"Project WARNING: CONFIG+=qtestlib is deprecated. Use QT+=testlib
instead."

Change-Id: Ia6dcce078736cac0f0b05e0f621a25f97c9dac87
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
---
 qtcreator.pri                                              | 4 ++++
 tests/auto/icheckbuild/icheckbuild.pro                     | 4 ++--
 tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro   | 3 ++-
 .../propertyeditortests/propertyeditortests.pro            | 7 +++----
 tests/auto/qml/qmleditor/qmllookup/qmllookup.pro           | 4 +++-
 tests/auto/qttest.pri                                      | 3 ++-
 6 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/qtcreator.pri b/qtcreator.pri
index 57df6e80797..eb4a331002c 100644
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -72,6 +72,8 @@ defineTest(minQtVersion) {
 
 isEqual(QT_MAJOR_VERSION, 5) {
 
+QTESTLIB = testlib
+
 # For use in custom compilers which just copy files
 defineReplace(stripSrcDir) {
     return($$relative_path($$absolute_path($$1, $$OUT_PWD), $$_PRO_FILE_PWD_))
@@ -79,6 +81,8 @@ defineReplace(stripSrcDir) {
 
 } else { # qt5
 
+QTESTLIB = qtestlib
+
 # For use in custom compilers which just copy files
 win32:i_flag = i
 defineReplace(stripSrcDir) {
diff --git a/tests/auto/icheckbuild/icheckbuild.pro b/tests/auto/icheckbuild/icheckbuild.pro
index 93a2182f58d..ad4aabf2954 100644
--- a/tests/auto/icheckbuild/icheckbuild.pro
+++ b/tests/auto/icheckbuild/icheckbuild.pro
@@ -1,10 +1,10 @@
-CONFIG += qtestlib testcase
+CONFIG += testcase
 
 include(../../../qtcreator.pri)
 include($$IDE_SOURCE_TREE/src/libs/cplusplus/cplusplus.pri)
 include($$IDE_SOURCE_TREE/src/plugins/cpptools/cpptools.pri)
 
-QT += testlib
+QT += $$QTESTLIB
 
 DEFINES += ICHECK_BUILD ICHECK_APP_BUILD
 
diff --git a/tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro b/tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro
index 521f6716637..6a74a83c609 100644
--- a/tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro
+++ b/tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro
@@ -1,6 +1,7 @@
 include(../../../../../qtcreator.pri)
 #include(../../../../../src/plugins/qmldesigner/config.pri)
-CONFIG += qtestlib testcase
+QT += $$QTESTLIB
+CONFIG += testcase
 
 ##DEFINES += DONT_MESS_WITH_QDEBUG
 
diff --git a/tests/auto/qml/qmldesigner/propertyeditortests/propertyeditortests.pro b/tests/auto/qml/qmldesigner/propertyeditortests/propertyeditortests.pro
index 1abde742359..f6fcad741b9 100644
--- a/tests/auto/qml/qmldesigner/propertyeditortests/propertyeditortests.pro
+++ b/tests/auto/qml/qmldesigner/propertyeditortests/propertyeditortests.pro
@@ -1,12 +1,11 @@
+include(../../../../../qtcreator.pri)
 TEMPLATE = app
-QT += script declarative webkit
-CONFIG += qtestlib testcase
+QT += script declarative webkit $$QTESTLIB
+CONFIG += testcase
 CONFIG += console
 CONFIG -= app_bundle
 
-include(../../../../../qtcreator.pri)
 include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/config.pri)
-
 include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore/designercore.pri)
 include($$IDE_SOURCE_TREE/src/libs/qmljs/qmljs-lib.pri)
 HEADERS+=$$IDE_SOURCE_TREE/src/libs/utils/changeset.h
diff --git a/tests/auto/qml/qmleditor/qmllookup/qmllookup.pro b/tests/auto/qml/qmleditor/qmllookup/qmllookup.pro
index 6a6210ec36d..30e580f8eee 100644
--- a/tests/auto/qml/qmleditor/qmllookup/qmllookup.pro
+++ b/tests/auto/qml/qmleditor/qmllookup/qmllookup.pro
@@ -1,5 +1,7 @@
+include(../../../../../qtcreator.pri)
 TEMPLATE = app
-CONFIG += qt warn_on console depend_includepath qtestlib testcase
+QT += $$QTESTLIB
+CONFIG += qt warn_on console depend_includepath testcase
 include(../../../../../src/libs/qmljs/qmljs-lib.pri)
 DEFINES += QML_BUILD_STATIC_LIB
 EDITOR_DIR=../../../../../src/plugins/qmljseditor
diff --git a/tests/auto/qttest.pri b/tests/auto/qttest.pri
index b2d95f31bb9..6e261b6ba01 100644
--- a/tests/auto/qttest.pri
+++ b/tests/auto/qttest.pri
@@ -2,7 +2,8 @@ include(../../qtcreator.pri)
 include(qttestrpath.pri)
 
 isEmpty(TEMPLATE):TEMPLATE=app
-CONFIG += qt warn_on console depend_includepath testcase qtestlib
+QT += $$QTESTLIB
+CONFIG += qt warn_on console depend_includepath testcase
 CONFIG -= app_bundle
 
 # prefix test binary with tst_