qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tests: Clean up inclusion of util.pri and debugutil.pri 

When we include debugutil.pri, we always want util.pri, too. We can as
well nest the inclusions.

Also, setting the include path is much easier from within the .pri files
than from outside.

Change-Id: I1205bdc3051e16e635d4ea9626f44e51002ddb50
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Ulf Hermann 2017-08-15 15:16:38 +02:00
parent 7fc6f5c6bb
commit 0c999c2e52
23 changed files with 4 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/qml/debugger/qdebugmessageservice/qdebugmessageservice.pro
View File

@ -5,8 +5,6 @@ osx:CONFIG -= app_bundle
SOURCES += tst_qdebugmessageservice.cpp
INCLUDEPATH += ../shared
include(../../../shared/util.pri)
include(../shared/debugutil.pri)
TESTDATA = data/*

1
tests/auto/qml/debugger/qpacketprotocol/qpacketprotocol.pro
View File

@ -4,7 +4,6 @@ osx:CONFIG -= app_bundle
SOURCES += tst_qpacketprotocol.cpp
INCLUDEPATH += ../shared
include(../shared/debugutil.pri)
QT += qml network testlib gui-private core-private

1
tests/auto/qml/debugger/qqmldebugclient/qqmldebugclient.pro
View File

@ -7,7 +7,6 @@ HEADERS += ../shared/qqmldebugtestservice.h
SOURCES += tst_qqmldebugclient.cpp \
../shared/qqmldebugtestservice.cpp
INCLUDEPATH += ../shared
include(../shared/debugutil.pri)
DEFINES += QT_QML_DEBUG_NO_WARNING

2
tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/qqmldebuggingenabler.pro
View File

@ -6,8 +6,6 @@ osx:CONFIG -= app_bundle
SOURCES += tst_qqmldebuggingenabler.cpp
INCLUDEPATH += ../../shared
include(../../../../shared/util.pri)
include(../../shared/debugutil.pri)
OTHER_FILES += data/test.qml

2
tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/qqmldebugjs.pro
View File

@ -6,8 +6,6 @@ osx:CONFIG -= app_bundle
SOURCES += tst_qqmldebugjs.cpp
INCLUDEPATH += ../../shared
include(../../../../shared/util.pri)
include(../../shared/debugutil.pri)
include(../../shared/qqmlenginedebugclient.pri)

1
tests/auto/qml/debugger/qqmldebuglocal/qqmldebuglocal.pro
View File

@ -7,7 +7,6 @@ HEADERS += ../shared/qqmldebugtestservice.h
SOURCES += tst_qqmldebuglocal.cpp \
../shared/qqmldebugtestservice.cpp
INCLUDEPATH += ../shared
include(../shared/debugutil.pri)
QT += qml-private testlib gui-private core-private

2
tests/auto/qml/debugger/qqmldebugservice/qqmldebugservice.pro
View File

@ -7,8 +7,6 @@ HEADERS += ../shared/qqmldebugtestservice.h
SOURCES += tst_qqmldebugservice.cpp \
../shared/qqmldebugtestservice.cpp
INCLUDEPATH += ../shared
include(../../../shared/util.pri)
include(../shared/debugutil.pri)
TESTDATA = data/*

2
tests/auto/qml/debugger/qqmlenginecontrol/qqmlenginecontrol.pro
View File

@ -4,8 +4,6 @@ osx:CONFIG -= app_bundle
SOURCES += tst_qqmlenginecontrol.cpp
INCLUDEPATH += ../shared
include(../../../shared/util.pri)
include(../shared/debugutil.pri)
TESTDATA = data/*

2
tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/qqmlenginedebuginspectorintegrationtest.pro
View File

@ -6,8 +6,6 @@ osx:CONFIG -= app_bundle
SOURCES += tst_qqmlenginedebuginspectorintegration.cpp
INCLUDEPATH += ../shared
include(../../../shared/util.pri)
include(../shared/qqmlinspectorclient.pri)
include(../shared/qqmlenginedebugclient.pri)
include(../shared/debugutil.pri)

2
tests/auto/qml/debugger/qqmlenginedebugservice/qqmlenginedebugservice.pro
View File

@ -5,8 +5,6 @@ osx:CONFIG -= app_bundle
SOURCES += \
tst_qqmlenginedebugservice.cpp
INCLUDEPATH += ../shared
include(../../../shared/util.pri)
include(../shared/qqmlenginedebugclient.pri)
include(../shared/debugutil.pri)

2
tests/auto/qml/debugger/qqmlinspector/qqmlinspector.pro
View File

@ -6,8 +6,6 @@ osx:CONFIG -= app_bundle
SOURCES += tst_qqmlinspector.cpp
INCLUDEPATH += ../shared
include(../../../shared/util.pri)
include(../shared/qqmlinspectorclient.pri)
include(../shared/debugutil.pri)

2
tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro
View File

@ -4,8 +4,6 @@ osx:CONFIG -= app_bundle
SOURCES += tst_qqmlprofilerservice.cpp
INCLUDEPATH += ../shared
include(../../../shared/util.pri)
include(../shared/debugutil.pri)
TESTDATA = data/*

3
tests/auto/qml/debugger/shared/debugutil.pri
View File

@ -1,4 +1,7 @@
QT += qmldebug-private
INCLUDEPATH += $$PWD
include($$PWD/../../../shared/util.pri)
HEADERS += $$PWD/debugutil_p.h
SOURCES += $$PWD/debugutil.cpp

1
tests/auto/qml/qjsonbinding/qjsonbinding.pro
View File

@ -3,7 +3,6 @@ TARGET = tst_qjsonbinding
macx:CONFIG -= app_bundle
SOURCES += tst_qjsonbinding.cpp
INCLUDEPATH += ../../shared
include (../../shared/util.pri)

1
tests/auto/qml/qqmlcomponent/qqmlcomponent.pro
View File

@ -2,7 +2,6 @@ CONFIG += testcase
TARGET = tst_qqmlcomponent
macx:CONFIG -= app_bundle
INCLUDEPATH += ../../shared/
SOURCES += tst_qqmlcomponent.cpp \
../../shared/testhttpserver.cpp

1
tests/auto/qml/qqmlecmascript/qqmlecmascript.pro
View File

@ -7,7 +7,6 @@ SOURCES += tst_qqmlecmascript.cpp \
../../shared/testhttpserver.cpp
HEADERS += testtypes.h \
../../shared/testhttpserver.h
INCLUDEPATH += ../../shared
RESOURCES += qqmlecmascript.qrc

1
tests/auto/qml/qqmlinstantiator/qqmlinstantiator.pro
View File

@ -2,7 +2,6 @@ CONFIG += testcase
TARGET = tst_qqmlinstantiator
macx:CONFIG -= app_bundle
INCLUDEPATH += ../../shared/
SOURCES += tst_qqmlinstantiator.cpp
HEADERS += stringmodel.h

1
tests/auto/qml/qqmllanguage/qqmllanguage.pro
View File

@ -6,7 +6,6 @@ SOURCES += tst_qqmllanguage.cpp \
testtypes.cpp
HEADERS += testtypes.h
INCLUDEPATH += ../../shared/
HEADERS += ../../shared/testhttpserver.h
SOURCES += ../../shared/testhttpserver.cpp

1
tests/auto/qml/qqmlxmlhttprequest/qqmlxmlhttprequest.pro
View File

@ -2,7 +2,6 @@ CONFIG += testcase
TARGET = tst_qqmlxmlhttprequest
macx:CONFIG -= app_bundle
INCLUDEPATH += ../../shared/
HEADERS += ../../shared/testhttpserver.h
SOURCES += tst_qqmlxmlhttprequest.cpp \

1
tests/auto/quick/qquickloader/qquickloader.pro
View File

@ -2,7 +2,6 @@ CONFIG += testcase
TARGET = tst_qquickloader
macx:CONFIG -= app_bundle
INCLUDEPATH += ../../shared/
HEADERS += ../../shared/testhttpserver.h
SOURCES += tst_qquickloader.cpp \

1
tests/auto/quick/qquickpixmapcache/qquickpixmapcache.pro
View File

@ -5,7 +5,6 @@ macx:CONFIG -= app_bundle
SOURCES += tst_qquickpixmapcache.cpp \
../../shared/testhttpserver.cpp
HEADERS += ../../shared/testhttpserver.h
INCLUDEPATH += ../../shared/
include (../../shared/util.pri)

1
tests/auto/quick/qquicktext/qquicktext.pro
View File

@ -4,7 +4,6 @@ macx:CONFIG -= app_bundle
SOURCES += tst_qquicktext.cpp
INCLUDEPATH += ../../shared/
HEADERS += ../../shared/testhttpserver.h
SOURCES += ../../shared/testhttpserver.cpp

1
tests/auto/shared/util.pri
View File

@ -1,4 +1,5 @@
INCLUDEPATH += $$PWD
HEADERS += $$PWD/util.h
SOURCES += $$PWD/util.cpp