feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Qt5: Fix warning "qtestlib is deprecated".

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

Change-Id: Ia6dcce078736cac0f0b05e0f621a25f97c9dac87
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
Nikolai Kosjar
2012-10-23 11:44:35 +02:00
parent e53f435219
commit 112f80c6c6
6 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qtcreator.pri
View File

@@ -72,6 +72,8 @@ defineTest(minQtVersion) {
isEqual(QT_MAJOR_VERSION, 5) { isEqual(QT_MAJOR_VERSION, 5) {
QTESTLIB = testlib
# For use in custom compilers which just copy files # For use in custom compilers which just copy files
defineReplace(stripSrcDir) { defineReplace(stripSrcDir) {
return($$relative_path($$absolute_path($$1, $$OUT_PWD), $$_PRO_FILE_PWD_)) return($$relative_path($$absolute_path($$1, $$OUT_PWD), $$_PRO_FILE_PWD_))
@@ -79,6 +81,8 @@ defineReplace(stripSrcDir) {
} else { # qt5 } else { # qt5
QTESTLIB = qtestlib
# For use in custom compilers which just copy files # For use in custom compilers which just copy files
win32:i_flag = i win32:i_flag = i
defineReplace(stripSrcDir) { defineReplace(stripSrcDir) {

4
tests/auto/icheckbuild/icheckbuild.pro
View File

@@ -1,10 +1,10 @@
CONFIG += qtestlib testcase CONFIG += testcase
include(../../../qtcreator.pri) include(../../../qtcreator.pri)
include($$IDE_SOURCE_TREE/src/libs/cplusplus/cplusplus.pri) include($$IDE_SOURCE_TREE/src/libs/cplusplus/cplusplus.pri)
include($$IDE_SOURCE_TREE/src/plugins/cpptools/cpptools.pri) include($$IDE_SOURCE_TREE/src/plugins/cpptools/cpptools.pri)
QT += testlib QT += $$QTESTLIB
DEFINES += ICHECK_BUILD ICHECK_APP_BUILD DEFINES += ICHECK_BUILD ICHECK_APP_BUILD

3
tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro
View File

@@ -1,6 +1,7 @@
include(../../../../../qtcreator.pri) include(../../../../../qtcreator.pri)
#include(../../../../../src/plugins/qmldesigner/config.pri) #include(../../../../../src/plugins/qmldesigner/config.pri)
CONFIG += qtestlib testcase QT += $$QTESTLIB
CONFIG += testcase
##DEFINES += DONT_MESS_WITH_QDEBUG ##DEFINES += DONT_MESS_WITH_QDEBUG

7
tests/auto/qml/qmldesigner/propertyeditortests/propertyeditortests.pro
View File

@@ -1,12 +1,11 @@
include(../../../../../qtcreator.pri)
TEMPLATE = app TEMPLATE = app
QT += script declarative webkit QT += script declarative webkit $$QTESTLIB
CONFIG += qtestlib testcase CONFIG += testcase
CONFIG += console CONFIG += console
CONFIG -= app_bundle CONFIG -= app_bundle
include(../../../../../qtcreator.pri)
include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/config.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/plugins/qmldesigner/designercore/designercore.pri)
include($$IDE_SOURCE_TREE/src/libs/qmljs/qmljs-lib.pri) include($$IDE_SOURCE_TREE/src/libs/qmljs/qmljs-lib.pri)
HEADERS+=$$IDE_SOURCE_TREE/src/libs/utils/changeset.h HEADERS+=$$IDE_SOURCE_TREE/src/libs/utils/changeset.h

4
tests/auto/qml/qmleditor/qmllookup/qmllookup.pro
View File

@@ -1,5 +1,7 @@
include(../../../../../qtcreator.pri)
TEMPLATE = app 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) include(../../../../../src/libs/qmljs/qmljs-lib.pri)
DEFINES += QML_BUILD_STATIC_LIB DEFINES += QML_BUILD_STATIC_LIB
EDITOR_DIR=../../../../../src/plugins/qmljseditor EDITOR_DIR=../../../../../src/plugins/qmljseditor

3
tests/auto/qttest.pri
View File

@@ -2,7 +2,8 @@ include(../../qtcreator.pri)
include(qttestrpath.pri) include(qttestrpath.pri)
isEmpty(TEMPLATE):TEMPLATE=app 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 CONFIG -= app_bundle
# prefix test binary with tst_ # prefix test binary with tst_