tests: Make them compile again properly

diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp
index dddef7a..33eb004 100644 (file)
--- a/tests/auto/debugger/tst_dumpers.cpp
+++ b/tests/auto/debugger/tst_dumpers.cpp
@@ -38,6 +38,7 @@
 #include "gdb/gdbmi.h"
 #include "gdbmacros.h"
 #include "gdbmacros_p.h"
+
 #include "json.h"
 
 #include <QtCore/private/qobject_p.h>
@@ -162,7 +163,7 @@ public:
 
     void testJson(const char* input)
     {
-        QCOMPARE('\n' + QString::fromLatin1(JsonValue(input).toString(false)),
+        QCOMPARE('\n' + QString::fromLatin1(Coda::JsonValue(input).toString(false)),
             '\n' + QString(input));
     }
 

diff --git a/tests/manual/cplusplus-frontend/cplusplus-frontend.pro b/tests/manual/cplusplus-frontend/cplusplus-frontend.pro
index 8169adf..c0fed9b 100644 (file)
--- a/tests/manual/cplusplus-frontend/cplusplus-frontend.pro
+++ b/tests/manual/cplusplus-frontend/cplusplus-frontend.pro
@@ -2,7 +2,8 @@ QT = core gui
 macx:CONFIG -= app_bundle
 TARGET = cplusplus0
 include(../../../qtcreator.pri)
-include(../../../src/libs/cplusplus/cplusplus.pri)
+include($$IDE_SOURCE_TREE/src/libs/cplusplus/cplusplus.pri)
+include($$IDE_SOURCE_TREE/src/libs/languageutils/languageutils.pri)
 
 # Input
 SOURCES += main.cpp

diff --git a/tests/manual/fakevim/fakevim.pro b/tests/manual/fakevim/fakevim.pro
index 5ddab6d..de7f8fa 100644 (file)
--- a/tests/manual/fakevim/fakevim.pro
+++ b/tests/manual/fakevim/fakevim.pro
@@ -1,5 +1,5 @@
 include(../../../qtcreator.pri)
-include(../../../src/libs/utils/utils.pri)
+include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
 
 FAKEVIMDIR = $$IDE_SOURCE_TREE/src/plugins/fakevim
 LIBSDIR = $$IDE_SOURCE_TREE/src/libs

diff --git a/tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp b/tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp
index 6ed5ffa..0a6e103 100644 (file)
--- a/tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp
+++ b/tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp
@@ -35,7 +35,7 @@
 
 //template <typename T> class B;  B foo() {}
 
-#include "../deeper/simple_gdbtest_app.h"
+#include "../simple/deep/deep/simple_gdbtest_app.h"
 
 #include <QtCore/QDebug>
 #include <QtCore/QDateTime>

diff --git a/tests/manual/preprocessor/preprocessor.pro b/tests/manual/preprocessor/preprocessor.pro
index 8b17b43..99d588d 100644 (file)
--- a/tests/manual/preprocessor/preprocessor.pro
+++ b/tests/manual/preprocessor/preprocessor.pro
@@ -3,7 +3,9 @@ macx:CONFIG -= app_bundle
 TARGET = pp
 
 include(../../../qtcreator.pri)
-include(../../../src/libs/cplusplus/cplusplus.pri)
+include($$IDE_SOURCE_TREE/src/libs/cplusplus/cplusplus.pri)
+include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
+include($$IDE_SOURCE_TREE/src/libs/3rdparty/botan/botan.pri)
 
 # Input
 SOURCES += main.cpp

diff --git a/tests/manual/process/process.pro b/tests/manual/process/process.pro
index 9f91dbb..1dc2b95 100644 (file)
--- a/tests/manual/process/process.pro
+++ b/tests/manual/process/process.pro
@@ -9,10 +9,10 @@ QT       += core
 QT       += gui
 
 include(../../../qtcreator.pri)
+include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
 
 # -- Add creator 'utils' lib
 macx:QMAKE_LFLAGS += -Wl,-rpath,\"$$IDE_BIN_PATH/..\"
-LIBS *= -l$$qtLibraryName(Utils)
 
 TARGET = process
 CONFIG   += console

diff --git a/tests/tools/qml-ast2dot/qml-ast2dot.pro b/tests/tools/qml-ast2dot/qml-ast2dot.pro
index dc83ce9..f43764d 100644 (file)
--- a/tests/tools/qml-ast2dot/qml-ast2dot.pro
+++ b/tests/tools/qml-ast2dot/qml-ast2dot.pro
@@ -5,6 +5,7 @@ TARGET = qml-ast2dot
 
 include($$IDE_SOURCE_TREE/src/libs/qmljs/qmljs.pri)
 include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
+include($$IDE_SOURCE_TREE/src/libs/languageutils/languageutils.pri)
 
 # Input
 SOURCES += main.cpp

diff --git a/tests/valgrind/callgrind/callgrindparsertests.pro b/tests/valgrind/callgrind/callgrindparsertests.pro
index f34a11d..e670db3 100644 (file)
--- a/tests/valgrind/callgrind/callgrindparsertests.pro
+++ b/tests/valgrind/callgrind/callgrindparsertests.pro
@@ -1,3 +1,4 @@
+include(../../../qtcreator.pri)
 TEMPLATE = app
 TARGET = callgrindparsertests
 
@@ -5,13 +6,13 @@ macx:CONFIG -= app_bundle
 
 QT += testlib network
 
-DEFINES += "PARSERTESTS_DATA_DIR=\"\\\"$$PWD/data\\\"\""
+DEFINES += "PARSERTESTS_DATA_DIR=\\\"$$PWD/data\\\""
 #enable extra debugging code
 DEFINES += "CALLGRINDPARSERTESTS"
 
 !win32 {
-    include(../../../qtcreator.pri)
     include(../../../src/libs/valgrind/valgrind.pri)
+    include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
 }
 
 SOURCES += callgrindparsertests.cpp

diff --git a/tests/valgrind/callgrind/modeltest.pro b/tests/valgrind/callgrind/modeltest.pro
index 2b3b6c7..89a26fb 100644 (file)
--- a/tests/valgrind/callgrind/modeltest.pro
+++ b/tests/valgrind/callgrind/modeltest.pro
@@ -1,11 +1,12 @@
+include(../../../qtcreator.pri)
 TEMPLATE = app
 TARGET = modeltest
 
 macx:CONFIG -= app_bundle
 
 !win32 {
-    include(../../../qtcreator.pri)
-    include(../../../src/plugins/callgrind/callgrind.pri)
+    include($$IDE_SOURCE_TREE/src/plugins/callgrind/callgrind.pri)
+    include($$IDE_SOURCE_TREE/src/libs/languageutils/languageutils.pri)
 }
 
 SRCDIR = $$IDE_SOURCE_TREE/src

diff --git a/tests/valgrind/memcheck/modeldemo.pro b/tests/valgrind/memcheck/modeldemo.pro
index a0a9773..19cb65a 100644 (file)
--- a/tests/valgrind/memcheck/modeldemo.pro
+++ b/tests/valgrind/memcheck/modeldemo.pro
@@ -1,3 +1,4 @@
+include(../../../qtcreator.pri)
 TEMPLATE = app
 TARGET = modeldemo
 
@@ -5,11 +6,12 @@ macx:CONFIG -= app_bundle
 
 QT += gui network
 
-DEFINES += "PARSERTESTS_DATA_DIR=\"\\\"$$PWD/data\\\"\""
+DEFINES += "PARSERTESTS_DATA_DIR=\\\"$$PWD/data\\\""
 
 !win32 {
-    include(../../../qtcreator.pri)
-    include(../../../src/libs/valgrind/valgrind.pri)
+    include($$IDE_SOURCE_TREE/src/libs/valgrind/valgrind.pri)
+    include($$IDE_SOURCE_TREE/src/libs/3rdparty/botan/botan.pri)
+    include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
 }
 
 SOURCES += modeldemo.cpp

diff --git a/tests/valgrind/memcheck/parsertests.pro b/tests/valgrind/memcheck/parsertests.pro
index 92eb6ec..c27b426 100644 (file)
--- a/tests/valgrind/memcheck/parsertests.pro
+++ b/tests/valgrind/memcheck/parsertests.pro
@@ -1,3 +1,4 @@
+include(../../../qtcreator.pri)
 TEMPLATE = app
 TARGET = parsertests
 
@@ -5,13 +6,14 @@ macx:CONFIG -= app_bundle
 
 QT += testlib network
 
-DEFINES += "PARSERTESTS_DATA_DIR=\"\\\"$$PWD/data\\\"\""
+DEFINES += "PARSERTESTS_DATA_DIR=\\\"$$PWD/data\\\""
 
-DEFINES += "VALGRIND_FAKE_PATH="\\\"$$IDE_BUILD_TREE/src/tools/valgrindfake/valgrind-fake\\\""
+DEFINES += "VALGRIND_FAKE_PATH=\\\"$$IDE_BUILD_TREE/src/tools/valgrindfake/valgrind-fake\\\""
 
 !win32 {
-    include(../../../qtcreator.pri)
-    include(../../../src/libs/valgrind/valgrind.pri)
+    include($$IDE_SOURCE_TREE/src/libs/valgrind/valgrind.pri)
+    include($$IDE_SOURCE_TREE/src/libs/3rdparty/botan/botan.pri)
+    include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
 }
 
 SOURCES += parsertests.cpp

diff --git a/tests/valgrind/memcheck/testrunner.pro b/tests/valgrind/memcheck/testrunner.pro
index 03af445..9881817 100644 (file)
--- a/tests/valgrind/memcheck/testrunner.pro
+++ b/tests/valgrind/memcheck/testrunner.pro
@@ -1,3 +1,4 @@
+include(../../../qtcreator.pri)
 TEMPLATE = app
 TARGET = testrunner
 
@@ -5,12 +6,13 @@ macx:CONFIG -= app_bundle
 
 QT += testlib network
 
-DEFINES += "TESTRUNNER_SRC_DIR=\"\\\"$$_PRO_FILE_PWD_/testapps\\\"\""
-DEFINES += "TESTRUNNER_APP_DIR=\"\\\"$(PWD)/testapps\\\"\""
+DEFINES += "TESTRUNNER_SRC_DIR=\\\"$$_PRO_FILE_PWD_/testapps\\\""
+DEFINES += "TESTRUNNER_APP_DIR=\\\"$(PWD)/testapps\\\""
 
 !win32 {
-    include(../../../qtcreator.pri)
-    include(../../../src/libs/valgrind/valgrind.pri)
+    include($$IDE_SOURCE_TREE/src/libs/valgrind/valgrind.pri)
+    include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
+    include($$IDE_SOURCE_TREE/src/libs/3rdparty/botan/botan.pri)
 }
 
 SOURCES += testrunner.cpp