Use "QT += testlib" consistently

If a project uses "load(qttest_p4)" it doesn't need to add testlib to
the CONFIG or QT variables.  If a project does not use
"load(qttest_p4)", it should add "testlib" to the QT variable.

Change-Id: If28353713ccdfe13612682e3e88dadebe2f2eefd
Reviewed-on: http://codereview.qt.nokia.com/159
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
Jason McDonald 2011-05-27 13:20:52 +10:00 committed by Qt Continuous Integration System
parent d49973f834
commit a6973e22ff
11 changed files with 7 additions and 36 deletions

View File

@ -1,5 +1,5 @@
SOURCES = testqstring.cpp SOURCES = testqstring.cpp
CONFIG += qtestlib QT += testlib
# install # install
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial1 target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial1

View File

@ -1,5 +1,5 @@
SOURCES = testqstring.cpp SOURCES = testqstring.cpp
CONFIG += qtestlib QT += testlib
# install # install
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial2 target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial2

View File

@ -1,5 +1,5 @@
SOURCES = testgui.cpp SOURCES = testgui.cpp
CONFIG += qtestlib QT += testlib
# install # install
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial3 target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial3

View File

@ -1,5 +1,5 @@
SOURCES = testgui.cpp SOURCES = testgui.cpp
CONFIG += qtestlib QT += testlib
# install # install
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial4 target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial4

View File

@ -1,5 +1,5 @@
SOURCES = benchmarking.cpp SOURCES = benchmarking.cpp
CONFIG += qtestlib QT += testlib
# install # install
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial5 target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial5

View File

@ -1,16 +1,8 @@
######################################################################
# Automatically generated by qmake (2.01a) Wed Apr 26 13:53:24 2006
######################################################################
load(qttest_p4) load(qttest_p4)
TEMPLATE = app TEMPLATE = app
TARGET = tst_qcompleter TARGET = tst_qcompleter
DEPENDPATH += . DEPENDPATH += .
INCLUDEPATH += . .. INCLUDEPATH += . ..
CONFIG += console qtestlib
# Input # Input
SOURCES += tst_qcompleter.cpp SOURCES += tst_qcompleter.cpp

View File

@ -1,15 +1,8 @@
######################################################################
# Automatically generated by qmake (2.01a) Wed Apr 26 13:53:24 2006
######################################################################
load(qttest_p4) load(qttest_p4)
TEMPLATE = app TEMPLATE = app
TARGET = tst_qerrormessage TARGET = tst_qerrormessage
DEPENDPATH += . DEPENDPATH += .
INCLUDEPATH += . INCLUDEPATH += .
CONFIG += console qtestlib
# Input # Input
SOURCES += tst_qerrormessage.cpp SOURCES += tst_qerrormessage.cpp

View File

@ -1,10 +1,6 @@
#include(../src/src.pri) #include(../src/src.pri)
QT = core script network QT = core script network testlib
requires(contains(QT_CONFIG,script))
CONFIG += qtestlib
DESTDIR = ./ DESTDIR = ./

View File

@ -1,13 +1,9 @@
######################################################################
# Automatically generated by qmake (2.01a) Wed Apr 26 13:53:24 2006
######################################################################
load(qttest_p4) load(qttest_p4)
TEMPLATE = app TEMPLATE = app
TARGET = tst_qmessagebox TARGET = tst_qmessagebox
DEPENDPATH += . DEPENDPATH += .
INCLUDEPATH += . INCLUDEPATH += .
CONFIG += console qtestlib
# Input # Input
SOURCES += tst_qmessagebox.cpp SOURCES += tst_qmessagebox.cpp

View File

@ -1,17 +1,12 @@
include(../qsharedmemory/src/src.pri) include(../qsharedmemory/src/src.pri)
QT = core script QT = core-private script testlib
QT += core-private
CONFIG += qtestlib
DESTDIR = ./ DESTDIR = ./
win32: CONFIG += console win32: CONFIG += console
mac:CONFIG -= app_bundle mac:CONFIG -= app_bundle
requires(contains(QT_CONFIG,script))
DEFINES += QSHAREDMEMORY_DEBUG DEFINES += QSHAREDMEMORY_DEBUG
DEFINES += QSYSTEMSEMAPHORE_DEBUG DEFINES += QSYSTEMSEMAPHORE_DEBUG

View File

@ -1,6 +1,5 @@
load(qttest_p4) load(qttest_p4)
CONFIG += qtestlib
SOURCES += tst_uic.cpp SOURCES += tst_uic.cpp
TARGET = tst_uic TARGET = tst_uic