Commit 112f80c6 authored by Nikolai Kosjar's avatar Nikolai Kosjar

Qt5: Fix warning "qtestlib is deprecated".

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

Change-Id: Ia6dcce078736cac0f0b05e0f621a25f97c9dac87
Reviewed-by: default avatarChristian Stenger <christian.stenger@digia.com>
parent e53f4352
......@@ -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) {
......
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
......
include(../../../../../qtcreator.pri)
#include(../../../../../src/plugins/qmldesigner/config.pri)
CONFIG += qtestlib testcase
QT += $$QTESTLIB
CONFIG += testcase
##DEFINES += DONT_MESS_WITH_QDEBUG
......
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
......
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
......
......@@ -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_
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment