Fix tests compilation

Change-Id: I20d990b6be83e5fcd30a8911bcd2bbe8cc303989
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

23 files changed, 37 insertions, 39 deletions

diff --git a/src/plugins/texteditor/generichighlighter/highlighter.h b/src/plugins/texteditor/generichighlighter/highlighter.h
index 81a7dd37ff..ad853c2315 100644
--- a/src/plugins/texteditor/generichighlighter/highlighter.h
+++ b/src/plugins/texteditor/generichighlighter/highlighter.h
@@ -30,8 +30,8 @@
 #ifndef HIGHLIGHTER_H
 #define HIGHLIGHTER_H
 
-#include "../basetextdocumentlayout.h"
-#include "../syntaxhighlighter.h"
+#include "basetextdocumentlayout.h"
+#include "syntaxhighlighter.h"
 
 #include <QString>
 #include <QVector>
diff --git a/src/plugins/texteditor/texteditor.qbs b/src/plugins/texteditor/texteditor.qbs
index 897deaf8d3..0db0da5beb 100644
--- a/src/plugins/texteditor/texteditor.qbs
+++ b/src/plugins/texteditor/texteditor.qbs
@@ -13,7 +13,8 @@ QtcPlugin {
     cpp.includePaths: base.concat([
         "generichighlighter",
         "snippets",
-        "codeassist"
+        "codeassist",
+        "."
     ])
 
     files: [
diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.pro b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.pro
index 138e62cc53..83a6ce845a 100644
--- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.pro
+++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.pro
@@ -14,4 +14,4 @@ COPYFILES = $$OTHER_FILES
 include(../../../copy.pri)
 
 TARGET = $$qtLibraryName(plugin1)
-DESTDIR = $$OUT_PWD
+CONFIG -= debug_and_release_target
diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.pro b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.pro
index 3aebb92fd2..1584db8b9e 100644
--- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.pro
+++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.pro
@@ -14,4 +14,4 @@ COPYFILES = $$OTHER_FILES
 include(../../../copy.pri)
 
 TARGET = $$qtLibraryName(plugin2)
-DESTDIR = $$OUT_PWD
+CONFIG -= debug_and_release_target
diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.pro b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.pro
index ad7a68ed5d..36fa161267 100644
--- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.pro
+++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.pro
@@ -14,4 +14,4 @@ COPYFILES = $$OTHER_FILES
 include(../../../copy.pri)
 
 TARGET = $$qtLibraryName(plugin3)
-DESTDIR = $$OUT_PWD
+CONFIG -= debug_and_release_target
diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.pro b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.pro
index 042f432c94..7b18c76702 100644
--- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.pro
+++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.pro
@@ -5,16 +5,15 @@ HEADERS += plugin1.h
 
 OTHER_FILES = $$PWD/plugin.spec
 
-include(../../../../../../qtcreator.pri)
+include(../../../../qttest.pri)
 include(../../../../../../src/libs/extensionsystem/extensionsystem.pri)
-include(../../../../qttestrpath.pri)
 
 COPYDIR = $$OUT_PWD
 COPYFILES = $$OTHER_FILES
 include(../../../copy.pri)
 
 TARGET = $$qtLibraryName(plugin1)
-DESTDIR = $$OUT_PWD
+CONFIG -= debug_and_release_target
 
 LIBS += -L$$OUT_PWD/../plugin2 -L$$OUT_PWD/../plugin3
 LIBS += -l$$qtLibraryName(plugin2) -l$$qtLibraryName(plugin3)
diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.pro b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.pro
index b43d9437d4..62ff154e41 100644
--- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.pro
+++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.pro
@@ -5,16 +5,15 @@ HEADERS += plugin2.h
 
 OTHER_FILES = $$PWD/plugin.spec
 
-include(../../../../../../qtcreator.pri)
+include(../../../../qttest.pri)
 include(../../../../../../src/libs/extensionsystem/extensionsystem.pri)
-include(../../../../qttestrpath.pri)
 
 COPYDIR = $$OUT_PWD
 COPYFILES = $$OTHER_FILES
 include(../../../copy.pri)
 
 TARGET = $$qtLibraryName(plugin2)
-DESTDIR = $$OUT_PWD
+CONFIG -= debug_and_release_target
 
 macx {
     QMAKE_LFLAGS_SONAME = -Wl,-install_name,$${OUT_PWD}/
diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.pro b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.pro
index 9fb23b328d..914f98a76f 100644
--- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.pro
+++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.pro
@@ -5,16 +5,15 @@ HEADERS += plugin3.h
 
 OTHER_FILES = $$PWD/plugin.spec
 
-include(../../../../../../qtcreator.pri)
+include(../../../../qttest.pri)
 include(../../../../../../src/libs/extensionsystem/extensionsystem.pri)
-include(../../../../qttestrpath.pri)
 
 COPYDIR = $$OUT_PWD
 COPYFILES = $$OTHER_FILES
 include(../../../copy.pri)
 
 TARGET = $$qtLibraryName(plugin3)
-DESTDIR = $$OUT_PWD
+CONFIG -= debug_and_release_target
 
 LIBS += -L$$OUT_PWD/../plugin2
 LIBS += -l$$qtLibraryName(plugin2)
diff --git a/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.pro b/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.pro
index 5b8d73a5f8..9119d14988 100644
--- a/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.pro
+++ b/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.pro
@@ -14,4 +14,4 @@ COPYFILES = $$PWD/testplugin.xml
 include(../../copy.pri)
 
 TARGET = $$qtLibraryName(test)
-DESTDIR = $$OUT_PWD
+CONFIG -= debug_and_release_target
diff --git a/tests/auto/utils/fileutils/fileutils.pro b/tests/auto/utils/fileutils/fileutils.pro
index 8989860f20..5d2530d668 100644
--- a/tests/auto/utils/fileutils/fileutils.pro
+++ b/tests/auto/utils/fileutils/fileutils.pro
@@ -1,5 +1,4 @@
 include(../../qttest.pri)
-include(../shared/shared.pri)
 
 include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
 
@@ -7,7 +6,10 @@ UTILSDIR = $$IDE_SOURCE_TREE/src/libs/
 
 INCLUDEPATH += $$UTILSDIR
 DEFINES += QTCREATOR_UTILS_LIB
+*-g++ {
+    CONFIG -= warn_on
+    QMAKE_CXXFLAGS += -Wall -Wno-trigraphs
+}
 
 SOURCES += tst_fileutils.cpp \
     $$UTILSDIR/utils/fileutils.cpp \
-
diff --git a/tests/manual/fakevim/fakevim.pro b/tests/manual/fakevim/fakevim.pro
index de7f8facbf..4cb3db3390 100644
--- a/tests/manual/fakevim/fakevim.pro
+++ b/tests/manual/fakevim/fakevim.pro
@@ -1,4 +1,4 @@
-include(../../../qtcreator.pri)
+include(../../auto/qttest.pri)
 include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
 
 FAKEVIMDIR = $$IDE_SOURCE_TREE/src/plugins/fakevim
diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro
index bdf9adbcf7..29f79d6c42 100644
--- a/tests/manual/manual.pro
+++ b/tests/manual/manual.pro
@@ -6,8 +6,7 @@ fakevim \
 debugger \
 preprocessor \
 subdir_proparser \
-utils \
-devices
+utils
 
 unix {
 #   Uses popen
diff --git a/tests/manual/preprocessor/main.cpp b/tests/manual/preprocessor/main.cpp
index 6bbbc9a6eb..573ab66594 100644
--- a/tests/manual/preprocessor/main.cpp
+++ b/tests/manual/preprocessor/main.cpp
@@ -113,6 +113,9 @@ public:
     virtual void stopExpandingMacro(unsigned, const Macro &)
     { }
 
+    virtual void markAsIncludeGuard(const QByteArray &)
+    { }
+
     virtual void startSkippingBlocks(unsigned)
     { }
 
diff --git a/tests/manual/preprocessor/preprocessor.pro b/tests/manual/preprocessor/preprocessor.pro
index 9cb836d598..7140a015fe 100644
--- a/tests/manual/preprocessor/preprocessor.pro
+++ b/tests/manual/preprocessor/preprocessor.pro
@@ -7,7 +7,6 @@ include(../../auto/qttest.pri)
 include($$IDE_SOURCE_TREE/src/libs/cplusplus/cplusplus.pri)
 include($$IDE_SOURCE_TREE/src/libs/languageutils/languageutils.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/ssh/remoteprocess/argumentscollector.cpp b/tests/manual/ssh/remoteprocess/argumentscollector.cpp
index 3830243535..2bf9356f0d 100644
--- a/tests/manual/ssh/remoteprocess/argumentscollector.cpp
+++ b/tests/manual/ssh/remoteprocess/argumentscollector.cpp
@@ -126,7 +126,7 @@ bool ArgumentsCollector::checkAndSetStringArg(int &pos, QString &arg, const char
 {
     if (m_arguments.at(pos) == QLatin1String(opt)) {
         if (!arg.isEmpty()) {
-            throw ArgumentErrorException(QLatin1String("option ") + opt
+            throw ArgumentErrorException(QLatin1String("option ") + QLatin1String(opt)
                 + QLatin1String(" was given twice."));
         }
         arg = m_arguments.at(++pos);
@@ -142,13 +142,13 @@ bool ArgumentsCollector::checkAndSetIntArg(int &pos, int &val,
 {
     if (m_arguments.at(pos) == QLatin1String(opt)) {
         if (alreadyGiven) {
-            throw ArgumentErrorException(QLatin1String("option ") + opt
+            throw ArgumentErrorException(QLatin1String("option ") + QLatin1String(opt)
                 + QLatin1String(" was given twice."));
         }
         bool isNumber;
         val = m_arguments.at(++pos).toInt(&isNumber);
         if (!isNumber) {
-            throw ArgumentErrorException(QLatin1String("option ") + opt
+            throw ArgumentErrorException(QLatin1String("option ") + QLatin1String(opt)
                  + QLatin1String(" needs integer argument"));
         }
         alreadyGiven = true;
diff --git a/tests/manual/ssh/sftp/argumentscollector.cpp b/tests/manual/ssh/sftp/argumentscollector.cpp
index 5869e3a862..5a8a765e89 100644
--- a/tests/manual/ssh/sftp/argumentscollector.cpp
+++ b/tests/manual/ssh/sftp/argumentscollector.cpp
@@ -124,7 +124,7 @@ bool ArgumentsCollector::checkAndSetStringArg(int &pos, QString &arg, const char
 {
     if (m_arguments.at(pos) == QLatin1String(opt)) {
         if (!arg.isEmpty()) {
-            throw ArgumentErrorException(QLatin1String("option ") + opt
+            throw ArgumentErrorException(QLatin1String("option ") + QLatin1String(opt)
                 + QLatin1String(" was given twice."));
         }
         arg = m_arguments.at(++pos);
@@ -140,13 +140,13 @@ bool ArgumentsCollector::checkAndSetIntArg(int &pos, int &val,
 {
     if (m_arguments.at(pos) == QLatin1String(opt)) {
         if (alreadyGiven) {
-            throw ArgumentErrorException(QLatin1String("option ") + opt
+            throw ArgumentErrorException(QLatin1String("option ") + QLatin1String(opt)
                 + QLatin1String(" was given twice."));
         }
         bool isNumber;
         val = m_arguments.at(++pos).toInt(&isNumber);
         if (!isNumber) {
-            throw ArgumentErrorException(QLatin1String("option ") + opt
+            throw ArgumentErrorException(QLatin1String("option ") + QLatin1String(opt)
                  + QLatin1String(" needs integer argument"));
         }
         alreadyGiven = true;
diff --git a/tests/manual/ssh/tunnel/argumentscollector.cpp b/tests/manual/ssh/tunnel/argumentscollector.cpp
index 31dde1af6e..b05a323a41 100644
--- a/tests/manual/ssh/tunnel/argumentscollector.cpp
+++ b/tests/manual/ssh/tunnel/argumentscollector.cpp
@@ -127,7 +127,7 @@ bool ArgumentsCollector::checkAndSetStringArg(int &pos, QString &arg, const char
 {
     if (m_arguments.at(pos) == QLatin1String(opt)) {
         if (!arg.isEmpty()) {
-            throw ArgumentErrorException(QLatin1String("option ") + opt
+            throw ArgumentErrorException(QLatin1String("option ") + QLatin1String(opt)
                 + QLatin1String(" was given twice."));
         }
         arg = m_arguments.at(++pos);
@@ -143,13 +143,13 @@ bool ArgumentsCollector::checkAndSetIntArg(int &pos, int &val,
 {
     if (m_arguments.at(pos) == QLatin1String(opt)) {
         if (alreadyGiven) {
-            throw ArgumentErrorException(QLatin1String("option ") + opt
+            throw ArgumentErrorException(QLatin1String("option ") + QLatin1String(opt)
                 + QLatin1String(" was given twice."));
         }
         bool isNumber;
         val = m_arguments.at(++pos).toInt(&isNumber);
         if (!isNumber) {
-            throw ArgumentErrorException(QLatin1String("option ") + opt
+            throw ArgumentErrorException(QLatin1String("option ") + QLatin1String(opt)
                  + QLatin1String(" needs integer argument"));
         }
         alreadyGiven = true;
diff --git a/tests/manual/utils/tcpportsgatherer/tcpportsgatherer.pro b/tests/manual/utils/tcpportsgatherer/tcpportsgatherer.pro
index 0e500831e2..001b5f41ad 100644
--- a/tests/manual/utils/tcpportsgatherer/tcpportsgatherer.pro
+++ b/tests/manual/utils/tcpportsgatherer/tcpportsgatherer.pro
@@ -7,7 +7,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 CONFIG += console
 CONFIG -= app_bundle
 
-include(../../../../qtcreator.pri)
+include(../../../auto/qttest.pri)
 include(../../../../src/rpath.pri)
 include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
 
diff --git a/tests/tools/qml-ast2dot/main.cpp b/tests/tools/qml-ast2dot/main.cpp
index 870ad50846..3213ba0e76 100644
--- a/tests/tools/qml-ast2dot/main.cpp
+++ b/tests/tools/qml-ast2dot/main.cpp
@@ -58,7 +58,7 @@ public:
     void operator()(const QString &fileName, const QByteArray &src, Node *ast) {
         _src = src;
         QString basename = fileName;
-        int dotIdx = basename.lastIndexOf('.');
+        int dotIdx = basename.lastIndexOf(QLatin1Char('.'));
         if (dotIdx != -1)
             basename.truncate(dotIdx);
         basename.append(QLatin1String(".ast.dot"));
@@ -99,7 +99,7 @@ protected:
     }
 
     QString spell(const SourceLocation &token) {
-        return _src.mid(token.offset, token.length).replace('\'', "\\\\").replace('"', "\\\"");
+        return QString::fromLatin1(_src.mid(token.offset, token.length).replace('\'', "\\\\").replace('"', "\\\""));
     }
 
     void terminal(const SourceLocation &token) {
@@ -332,7 +332,7 @@ int main(int argc, char *argv[])
         file.close();
 
         Document::MutablePtr doc = Document::create(fileName, Document::guessLanguageFromSuffix(fileName));
-        doc->setSource(source);
+        doc->setSource(QString::fromUtf8(source));
         doc->parse();
 
         foreach (const DiagnosticMessage &m, doc->diagnosticMessages()) {
diff --git a/tests/valgrind/memcheck/memcheck.pro b/tests/valgrind/memcheck/memcheck.pro
index ee72ee0010..eed8482d76 100644
--- a/tests/valgrind/memcheck/memcheck.pro
+++ b/tests/valgrind/memcheck/memcheck.pro
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
-
+CONFIG += ordered
 SUBDIRS += parsertests.pro modeldemo.pro testapps testrunner.pro
diff --git a/tests/valgrind/memcheck/modeldemo.pro b/tests/valgrind/memcheck/modeldemo.pro
index eb843efdf7..5ce312ede7 100644
--- a/tests/valgrind/memcheck/modeldemo.pro
+++ b/tests/valgrind/memcheck/modeldemo.pro
@@ -1,6 +1,5 @@
 include(../../../qtcreator.pri)
 include(../../auto/qttestrpath.pri)
-include($$IDE_SOURCE_TREE/src/libs/3rdparty/botan/botan.pri)
 include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
 include($$IDE_SOURCE_TREE/src/libs/ssh/ssh.pri)
 include($$IDE_SOURCE_TREE/src/plugins/valgrind/valgrind_test.pri)
diff --git a/tests/valgrind/memcheck/parsertests.pro b/tests/valgrind/memcheck/parsertests.pro
index e58578dabe..8da114d90f 100644
--- a/tests/valgrind/memcheck/parsertests.pro
+++ b/tests/valgrind/memcheck/parsertests.pro
@@ -1,5 +1,4 @@
 include(../../auto/qttest.pri)
-include($$IDE_SOURCE_TREE/src/libs/3rdparty/botan/botan.pri)
 include($$IDE_SOURCE_TREE/src/libs/ssh/ssh.pri)
 include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
 include($$IDE_SOURCE_TREE/src/plugins/valgrind/valgrind_test.pri)
diff --git a/tests/valgrind/memcheck/testrunner.pro b/tests/valgrind/memcheck/testrunner.pro
index fea9eebd00..acfa3a2047 100644
--- a/tests/valgrind/memcheck/testrunner.pro
+++ b/tests/valgrind/memcheck/testrunner.pro
@@ -1,6 +1,5 @@
 include(../../auto/qttest.pri)
 include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
-include($$IDE_SOURCE_TREE/src/libs/3rdparty/botan/botan.pri)
 include($$IDE_SOURCE_TREE/src/libs/ssh/ssh.pri)
 include($$IDE_SOURCE_TREE/src/plugins/valgrind/valgrind_test.pri)