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:
parent
d49973f834
commit
a6973e22ff
@ -1,5 +1,5 @@
|
||||
SOURCES = testqstring.cpp
|
||||
CONFIG += qtestlib
|
||||
QT += testlib
|
||||
|
||||
# install
|
||||
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial1
|
||||
|
@ -1,5 +1,5 @@
|
||||
SOURCES = testqstring.cpp
|
||||
CONFIG += qtestlib
|
||||
QT += testlib
|
||||
|
||||
# install
|
||||
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial2
|
||||
|
@ -1,5 +1,5 @@
|
||||
SOURCES = testgui.cpp
|
||||
CONFIG += qtestlib
|
||||
QT += testlib
|
||||
|
||||
# install
|
||||
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial3
|
||||
|
@ -1,5 +1,5 @@
|
||||
SOURCES = testgui.cpp
|
||||
CONFIG += qtestlib
|
||||
QT += testlib
|
||||
|
||||
# install
|
||||
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial4
|
||||
|
@ -1,5 +1,5 @@
|
||||
SOURCES = benchmarking.cpp
|
||||
CONFIG += qtestlib
|
||||
QT += testlib
|
||||
|
||||
# install
|
||||
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtestlib/tutorial5
|
||||
|
@ -1,16 +1,8 @@
|
||||
######################################################################
|
||||
# Automatically generated by qmake (2.01a) Wed Apr 26 13:53:24 2006
|
||||
######################################################################
|
||||
load(qttest_p4)
|
||||
TEMPLATE = app
|
||||
TARGET = tst_qcompleter
|
||||
DEPENDPATH += .
|
||||
INCLUDEPATH += . ..
|
||||
|
||||
CONFIG += console qtestlib
|
||||
|
||||
# Input
|
||||
SOURCES += tst_qcompleter.cpp
|
||||
|
||||
|
||||
|
||||
|
@ -1,15 +1,8 @@
|
||||
######################################################################
|
||||
# Automatically generated by qmake (2.01a) Wed Apr 26 13:53:24 2006
|
||||
######################################################################
|
||||
load(qttest_p4)
|
||||
TEMPLATE = app
|
||||
TARGET = tst_qerrormessage
|
||||
DEPENDPATH += .
|
||||
INCLUDEPATH += .
|
||||
|
||||
CONFIG += console qtestlib
|
||||
# Input
|
||||
SOURCES += tst_qerrormessage.cpp
|
||||
|
||||
|
||||
|
||||
|
@ -1,10 +1,6 @@
|
||||
#include(../src/src.pri)
|
||||
|
||||
QT = core script network
|
||||
|
||||
requires(contains(QT_CONFIG,script))
|
||||
|
||||
CONFIG += qtestlib
|
||||
QT = core script network testlib
|
||||
|
||||
DESTDIR = ./
|
||||
|
||||
|
@ -1,13 +1,9 @@
|
||||
######################################################################
|
||||
# Automatically generated by qmake (2.01a) Wed Apr 26 13:53:24 2006
|
||||
######################################################################
|
||||
load(qttest_p4)
|
||||
TEMPLATE = app
|
||||
TARGET = tst_qmessagebox
|
||||
DEPENDPATH += .
|
||||
INCLUDEPATH += .
|
||||
|
||||
CONFIG += console qtestlib
|
||||
# Input
|
||||
SOURCES += tst_qmessagebox.cpp
|
||||
|
||||
|
@ -1,17 +1,12 @@
|
||||
include(../qsharedmemory/src/src.pri)
|
||||
|
||||
QT = core script
|
||||
QT += core-private
|
||||
|
||||
CONFIG += qtestlib
|
||||
QT = core-private script testlib
|
||||
|
||||
DESTDIR = ./
|
||||
|
||||
win32: CONFIG += console
|
||||
mac:CONFIG -= app_bundle
|
||||
|
||||
requires(contains(QT_CONFIG,script))
|
||||
|
||||
DEFINES += QSHAREDMEMORY_DEBUG
|
||||
DEFINES += QSYSTEMSEMAPHORE_DEBUG
|
||||
|
||||
|
@ -1,6 +1,5 @@
|
||||
load(qttest_p4)
|
||||
|
||||
CONFIG += qtestlib
|
||||
SOURCES += tst_uic.cpp
|
||||
TARGET = tst_uic
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user