From 485dec6d2b3347b87b307f21597a0f4dbd5c930f Mon Sep 17 00:00:00 2001 From: Roberto Raggi <roberto.raggi@nokia.com> Date: Mon, 26 Oct 2009 14:40:36 +0100 Subject: [PATCH] Link with cplusplus library. --- tests/auto/cplusplus/ast/ast.pro | 2 +- tests/auto/cplusplus/lookup/lookup.pro | 6 ++---- tests/auto/cplusplus/preprocessor/preprocessor.pro | 6 ++---- tests/auto/cplusplus/semantic/semantic.pro | 2 +- tests/auto/cplusplus/shared/shared.pri | 1 + tests/auto/cplusplus/shared/shared.pro | 6 +++--- 6 files changed, 10 insertions(+), 13 deletions(-) diff --git a/tests/auto/cplusplus/ast/ast.pro b/tests/auto/cplusplus/ast/ast.pro index 2f5a0a33eae..05435839c6c 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 b80aa2f2b7b..9011a33f612 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 463de3ccfb3..bc7c98ea4ea 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 09f80ab27ab..2198ab78c73 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 d0c398dae80..80dab035ba8 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 f8eb83829da..72f904a9799 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) -- GitLab