diff options
| author | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2012-10-30 11:38:06 +0100 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2012-11-05 12:58:53 +0100 |
| commit | fb61be5ed62cb8803ca3c8bb5de183507c28578d (patch) | |
| tree | 267c201ca7b97e1378e43e10fb32f215729d7e06 | |
| parent | 88d52c1d594a855b2002738277fe779e35878141 (diff) | |
| download | qt-creator-fb61be5ed62cb8803ca3c8bb5de183507c28578d.tar.gz | |
Qt5: Correct usage of testlib.
This corrects commit 112f80. $$QTESTLIB is not needed since both Qt4 and
Qt5 support "QT += testlib".
Change-Id: I776b44825295c86d2d85e9b8dc6a422da6f36ab6
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
| -rw-r--r-- | qtcreator.pri | 4 | ||||
| -rw-r--r-- | tests/auto/icheckbuild/icheckbuild.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qml/qmldesigner/propertyeditortests/propertyeditortests.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qml/qmleditor/qmllookup/qmllookup.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qttest.pri | 2 |
6 files changed, 5 insertions, 9 deletions
diff --git a/qtcreator.pri b/qtcreator.pri index af4a50f2b0..63b48569f0 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -72,8 +72,6 @@ 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_)) @@ -81,8 +79,6 @@ 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 ad4aabf295..e7ea6b4b96 100644 --- a/tests/auto/icheckbuild/icheckbuild.pro +++ b/tests/auto/icheckbuild/icheckbuild.pro @@ -4,7 +4,7 @@ include(../../../qtcreator.pri) include($$IDE_SOURCE_TREE/src/libs/cplusplus/cplusplus.pri) include($$IDE_SOURCE_TREE/src/plugins/cpptools/cpptools.pri) -QT += $$QTESTLIB +QT += testlib 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 6a74a83c60..b7184762b8 100644 --- a/tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro +++ b/tests/auto/qml/qmldesigner/bauhaustests/bauhaustests.pro @@ -1,6 +1,6 @@ include(../../../../../qtcreator.pri) #include(../../../../../src/plugins/qmldesigner/config.pri) -QT += $$QTESTLIB +QT += testlib 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 f6fcad741b..323ae83913 100644 --- a/tests/auto/qml/qmldesigner/propertyeditortests/propertyeditortests.pro +++ b/tests/auto/qml/qmldesigner/propertyeditortests/propertyeditortests.pro @@ -1,6 +1,6 @@ include(../../../../../qtcreator.pri) TEMPLATE = app -QT += script declarative webkit $$QTESTLIB +QT += script declarative webkit testlib CONFIG += testcase CONFIG += console CONFIG -= app_bundle diff --git a/tests/auto/qml/qmleditor/qmllookup/qmllookup.pro b/tests/auto/qml/qmleditor/qmllookup/qmllookup.pro index 30e580f8ee..c80b437af3 100644 --- a/tests/auto/qml/qmleditor/qmllookup/qmllookup.pro +++ b/tests/auto/qml/qmleditor/qmllookup/qmllookup.pro @@ -1,6 +1,6 @@ include(../../../../../qtcreator.pri) TEMPLATE = app -QT += $$QTESTLIB +QT += testlib CONFIG += qt warn_on console depend_includepath testcase include(../../../../../src/libs/qmljs/qmljs-lib.pri) DEFINES += QML_BUILD_STATIC_LIB diff --git a/tests/auto/qttest.pri b/tests/auto/qttest.pri index 6e261b6ba0..cc4ce6888c 100644 --- a/tests/auto/qttest.pri +++ b/tests/auto/qttest.pri @@ -2,7 +2,7 @@ include(../../qtcreator.pri) include(qttestrpath.pri) isEmpty(TEMPLATE):TEMPLATE=app -QT += $$QTESTLIB +QT += testlib CONFIG += qt warn_on console depend_includepath testcase CONFIG -= app_bundle |