From 78930b334b237e5cf29371ec51d943bb18390fc1 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Tue, 10 Sep 2013 22:56:03 +0300 Subject: [PATCH] Fix tests compilation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * CPlusPlusForwardDeclarations.h not found * Valgrind tests that include botan missing -ldl. botan is not required for them (they link just fine without it). Change-Id: I279b03990ad36d01c93700d50ae8e5119bf5be80 Reviewed-by: André Hartmann Reviewed-by: Nikolai Kosjar --- tests/auto/valgrind/memcheck/modeldemo.pro | 1 - tests/auto/valgrind/memcheck/parsertests.pro | 1 - tests/manual/plain-cplusplus/Preprocessor.h | 2 +- tests/manual/plain-cplusplus/plain-cplusplus.pro | 1 + 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/auto/valgrind/memcheck/modeldemo.pro b/tests/auto/valgrind/memcheck/modeldemo.pro index 3ab4c582863..8d25b4ab9cb 100644 --- a/tests/auto/valgrind/memcheck/modeldemo.pro +++ b/tests/auto/valgrind/memcheck/modeldemo.pro @@ -1,7 +1,6 @@ QTC_LIB_DEPENDS += utils ssh include(../../../../qtcreator.pri) include(../../qttestrpath.pri) -include($$IDE_SOURCE_TREE/src/libs/3rdparty/botan/botan.pri) include($$IDE_SOURCE_TREE/src/plugins/valgrind/valgrind_test.pri) TEMPLATE = app diff --git a/tests/auto/valgrind/memcheck/parsertests.pro b/tests/auto/valgrind/memcheck/parsertests.pro index 24b86045600..68ee9d9ea7c 100644 --- a/tests/auto/valgrind/memcheck/parsertests.pro +++ b/tests/auto/valgrind/memcheck/parsertests.pro @@ -1,6 +1,5 @@ QTC_LIB_DEPENDS += utils ssh include(../../qttest.pri) -include($$IDE_SOURCE_TREE/src/libs/3rdparty/botan/botan.pri) include($$IDE_SOURCE_TREE/src/plugins/valgrind/valgrind_test.pri) TARGET = tst_parsertests diff --git a/tests/manual/plain-cplusplus/Preprocessor.h b/tests/manual/plain-cplusplus/Preprocessor.h index 3c9de681c11..5031cda1ae3 100644 --- a/tests/manual/plain-cplusplus/Preprocessor.h +++ b/tests/manual/plain-cplusplus/Preprocessor.h @@ -40,7 +40,7 @@ namespace CPlusPlus { class Lexer; class Token; -class CPLUSPLUS_EXPORT StringRef +class StringRef { const char *_text; unsigned _size; diff --git a/tests/manual/plain-cplusplus/plain-cplusplus.pro b/tests/manual/plain-cplusplus/plain-cplusplus.pro index d7466cbdfed..3272942d25e 100644 --- a/tests/manual/plain-cplusplus/plain-cplusplus.pro +++ b/tests/manual/plain-cplusplus/plain-cplusplus.pro @@ -9,6 +9,7 @@ macx { } include(../../../src/libs/3rdparty/cplusplus/cplusplus.pri) +INCLUDEPATH += ../../../src/libs/3rdparty/cplusplus # Input HEADERS += Preprocessor.h