From 5b2fb4bb67417cc1018ceef408cb7347c3e91931 Mon Sep 17 00:00:00 2001 From: Bill King Date: Wed, 18 Aug 2010 12:09:42 +1000 Subject: [PATCH] Fixes: get tests compiling again that depend on the cpp library Details: This gets the tests running again, by statically linking them. qmake doesn't have support for depending upon other projects being built, so when the projects are built out of order, libCPlusPlusTest.so wasn't being built before trying to be linked against. --- tests/auto/cplusplus/cplusplus.pro | 1 - tests/auto/cplusplus/shared/shared.pri | 2 +- tests/auto/cplusplus/shared/shared.pro | 5 ----- 3 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 tests/auto/cplusplus/shared/shared.pro diff --git a/tests/auto/cplusplus/cplusplus.pro b/tests/auto/cplusplus/cplusplus.pro index c5d9930c7f1..920f93f30cd 100644 --- a/tests/auto/cplusplus/cplusplus.pro +++ b/tests/auto/cplusplus/cplusplus.pro @@ -2,7 +2,6 @@ TEMPLATE = subdirs CONFIG += ordered SUBDIRS = \ - shared \ ast \ semantic \ lookup \ diff --git a/tests/auto/cplusplus/shared/shared.pri b/tests/auto/cplusplus/shared/shared.pri index 2960afc9f6c..f89b4c65f01 100644 --- a/tests/auto/cplusplus/shared/shared.pri +++ b/tests/auto/cplusplus/shared/shared.pri @@ -2,4 +2,4 @@ DEFINES+=CPLUSPLUS_BUILD_STATIC_LIB include(../../../../qtcreator.pri) INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/cplusplus INCLUDEPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus -LIBS += -L$$OUT_PWD/../shared -lCPlusPlusTestSupport +include($$PWD/../../../../src/libs/cplusplus/cplusplus-lib.pri) diff --git a/tests/auto/cplusplus/shared/shared.pro b/tests/auto/cplusplus/shared/shared.pro deleted file mode 100644 index 1c7a7f9e9df..00000000000 --- a/tests/auto/cplusplus/shared/shared.pro +++ /dev/null @@ -1,5 +0,0 @@ -TEMPLATE = lib -TARGET = CPlusPlusTestSupport -CONFIG += static depend_includepath -QT = core gui -include($$PWD/../../../../src/libs/cplusplus/cplusplus-lib.pri)