diff --git a/tests/auto/cplusplus/ast/ast.pro b/tests/auto/cplusplus/ast/ast.pro index 2f5a0a33eae956f43a47ec9758b53513ae8cbce9..05435839c6c96b7acd03efcd4f8c491d6f6d65a3 100644 --- a/tests/auto/cplusplus/ast/ast.pro +++ b/tests/auto/cplusplus/ast/ast.pro @@ -1,6 +1,6 @@ TEMPLATE = app CONFIG += qt warn_on console depend_includepath -QT = core testlib +QT += testlib include(../shared/shared.pri) SOURCES += tst_ast.cpp TARGET=tst_$$TARGET diff --git a/tests/auto/cplusplus/lookup/lookup.pro b/tests/auto/cplusplus/lookup/lookup.pro index b80aa2f2b7bc30a046f5ecb7bbcc89f1f8f983d1..9011a33f612d0a6014c6baaf4fdb720532849333 100644 --- a/tests/auto/cplusplus/lookup/lookup.pro +++ b/tests/auto/cplusplus/lookup/lookup.pro @@ -1,8 +1,6 @@ TEMPLATE = app CONFIG += qt warn_on console depend_includepath -QT = core testlib - -include(../../../../src/libs/cplusplus/cplusplus-lib.pri) - +QT += testlib +include(../shared/shared.pri) SOURCES += tst_lookup.cpp TARGET=tst_$$TARGET diff --git a/tests/auto/cplusplus/preprocessor/preprocessor.pro b/tests/auto/cplusplus/preprocessor/preprocessor.pro index 463de3ccfb34039f9ad8f2bcec275bd556cfa947..bc7c98ea4eaf0f6392b582865335f14a85956161 100644 --- a/tests/auto/cplusplus/preprocessor/preprocessor.pro +++ b/tests/auto/cplusplus/preprocessor/preprocessor.pro @@ -1,8 +1,6 @@ TEMPLATE = app CONFIG += qt warn_on console depend_includepath -QT = core testlib +QT += testlib TARGET = tst_$$TARGET - -include(../../../../src/libs/cplusplus/cplusplus-lib.pri) - +include(../shared/shared.pri) SOURCES += tst_preprocessor.cpp diff --git a/tests/auto/cplusplus/semantic/semantic.pro b/tests/auto/cplusplus/semantic/semantic.pro index 09f80ab27abb71ce1efd01a76ff1ca105b1c5cc1..2198ab78c736fff168af5e92e7a55018f6c8d617 100644 --- a/tests/auto/cplusplus/semantic/semantic.pro +++ b/tests/auto/cplusplus/semantic/semantic.pro @@ -1,6 +1,6 @@ TEMPLATE = app CONFIG += qt warn_on console depend_includepath -QT = core testlib +QT += testlib include(../shared/shared.pri) SOURCES += tst_semantic.cpp diff --git a/tests/auto/cplusplus/shared/shared.pri b/tests/auto/cplusplus/shared/shared.pri index d0c398dae80d79089c53ddde43ee03f3e0a3712b..80dab035ba8f6b391b20a2ad86f9146b3ac45772 100644 --- a/tests/auto/cplusplus/shared/shared.pri +++ b/tests/auto/cplusplus/shared/shared.pri @@ -1,4 +1,5 @@ INCLUDEPATH += $$PWD/../../../../src/shared/cplusplus +INCLUDEPATH += $$PWD/../../../../src/libs/cplusplus DEPENDPATH += $$INCLUDEPATH . LIBS += -L$$PWD -lCPlusPlusTestSupport diff --git a/tests/auto/cplusplus/shared/shared.pro b/tests/auto/cplusplus/shared/shared.pro index f8eb83829dae571bf92315e834d6b2e901606019..72f904a9799db52796095fd78547fd86bb710d9c 100644 --- a/tests/auto/cplusplus/shared/shared.pro +++ b/tests/auto/cplusplus/shared/shared.pro @@ -1,8 +1,8 @@ TEMPLATE = lib TARGET = CPlusPlusTestSupport -CONFIG += static -QT = core +CONFIG += static depend_includepath +QT = core gui DESTDIR = $$PWD +include($$PWD/../../../../src/libs/cplusplus/cplusplus-lib.pri) -include($$PWD/../../../../src/shared/cplusplus/cplusplus.pri)