Fixes autotests for windows.

tests/auto/cplusplus/codeformatter/codeformatter.pro

@@ -3,13 +3,6 @@ include(../shared/shared.pri)
 
 SRCDIR = ../../../../src
 
-SOURCES += \
+SOURCES += tst_codeformatter.cpp
-    tst_codeformatter.cpp \
-    $$SRCDIR/plugins/cpptools/cppcodeformatter.cpp \
-    $$SRCDIR/plugins/texteditor/basetextdocumentlayout.cpp
-
-HEADERS += \
-    $$SRCDIR/plugins/cpptools/cppcodeformatter.h \
-    $$SRCDIR/plugins/texteditor/basetextdocumentlayout.h
 
 INCLUDEPATH += $$SRCDIR/plugins $$SRCDIR/libs

tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.cpp

@@ -30,6 +30,7 @@
 #include "plugin1.h"
 
 #include <QtCore/qplugin.h>
+#include <QStringList>
 
 using namespace Plugin1;
 

tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.pro

@@ -14,3 +14,6 @@ COPYFILES = $$OTHER_FILES
 include(../../../copy.pri)
 
 TARGET = $$qtLibraryName(plugin1)
+
+DESTDIR = $$OUT_PWD/../lib
+LIBS += -L$$OUT_PWD/../lib

tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.pro

@@ -14,3 +14,6 @@ COPYFILES = $$OTHER_FILES
 include(../../../copy.pri)
 
 TARGET = $$qtLibraryName(plugin2)
+
+DESTDIR = $$OUT_PWD/../lib
+LIBS += -L$$OUT_PWD/../lib

tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.pro

@@ -14,3 +14,6 @@ COPYFILES = $$OTHER_FILES
 include(../../../copy.pri)
 
 TARGET = $$qtLibraryName(plugin3)
+
+DESTDIR = $$OUT_PWD/../lib
+LIBS += -L$$OUT_PWD/../lib

tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.pro

@@ -15,10 +15,12 @@ include(../../../copy.pri)
 
 TARGET = $$qtLibraryName(plugin1)
 
-LIBS += -L$${OUT_PWD}/../plugin2 -L$${OUT_PWD}/../plugin3 -l$$qtLibraryName(plugin2) -l$$qtLibraryName(plugin3)
+DESTDIR = $$OUT_PWD/../lib
+LIBS += -L$$OUT_PWD/../lib
+
+LIBS += -l$$qtLibraryName(plugin2) -l$$qtLibraryName(plugin3)
 
 macx {
 } else:unix {
-    QMAKE_RPATHDIR += $${OUT_PWD}/../plugin2
+    QMAKE_RPATHDIR += $$OUT_PWD/../lib
-    QMAKE_RPATHDIR += $${OUT_PWD}/../plugin3
 }

tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.pro

@@ -15,6 +15,9 @@ include(../../../copy.pri)
 
 TARGET = $$qtLibraryName(plugin2)
 
+DESTDIR = $$OUT_PWD/../lib
+LIBS += -L$$OUT_PWD/../lib
+
 macx {
     QMAKE_LFLAGS_SONAME = -Wl,-install_name,$${OUT_PWD}/
 }

tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.pro

@@ -15,10 +15,12 @@ include(../../../copy.pri)
 
 TARGET = $$qtLibraryName(plugin3)
 
-LIBS += -L$${OUT_PWD}/../plugin2 -l$$qtLibraryName(plugin2)
+DESTDIR = $$OUT_PWD/../lib
+LIBS += -L$$OUT_PWD/../lib
+LIBS += -l$$qtLibraryName(plugin2)
 
 macx {
     QMAKE_LFLAGS_SONAME = -Wl,-install_name,$${OUT_PWD}/
 } else:unix {
-    QMAKE_RPATHDIR += $${OUT_PWD}/../plugin2
+    QMAKE_RPATHDIR += $OUT_PWD/../lib
 }

tests/auto/fakevim/fakevim.pro

@@ -3,7 +3,7 @@ include(../qttest.pri)
 # Defines import symbol as empty
 DEFINES+=QTCREATOR_UTILS_STATIC_LIB
 
-include(../../../src/libs/utils/utils-lib.pri)
+include(../../../src/libs/utils/utils.pri)
 
 FAKEVIMDIR = ../../../src/plugins/fakevim
 UTILSDIR = ../../../src/libs

tests/manual/cplusplus-frontend/cplusplus-frontend.pro

@@ -2,7 +2,7 @@ QT = core gui
 macx:CONFIG -= app_bundle
 TARGET = cplusplus0
 
-include(../../../src/libs/cplusplus/cplusplus-lib.pri)
+include(../../../src/libs/cplusplus/cplusplus.pri)
 
 # Input
 SOURCES += main.cpp

tests/manual/fakevim/fakevim.pro

@@ -1,24 +1,17 @@
-FAKEVIMHOME = ../../../src/plugins/fakevim
+include(../../../qtcreator.pri)
-LIBSDIR = ../../../src/libs
+include(../../../src/libs/utils/utils.pri)
 
-SOURCES += \
+FAKEVIMDIR = $$IDE_SOURCE_TREE/src/plugins/fakevim
-	main.cpp \
+LIBSDIR = $$IDE_SOURCE_TREE/src/libs
-	$$FAKEVIMHOME/fakevimhandler.cpp \
-	$$FAKEVIMHOME/fakevimactions.cpp \
-        $$FAKEVIMHOME/fakevimsyntax.cpp \
-        $$LIBSDIR/utils/basevalidatinglineedit.cpp \
-        $$LIBSDIR/utils/environment.cpp \
-        $$LIBSDIR/utils/pathchooser.cpp \
-        $$LIBSDIR/utils/savedaction.cpp
 
-HEADERS += \
+SOURCES += main.cpp \
-	$$FAKEVIMHOME/fakevimhandler.h \
+            $$FAKEVIMDIR/fakevimhandler.cpp \
-	$$FAKEVIMHOME/fakevimactions.h \
+            $$FAKEVIMDIR/fakevimactions.cpp \
-        $$FAKEVIMHOME/fakevimsyntax.h \
+            $$FAKEVIMDIR/fakevimsyntax.cpp \
-        $$LIBSDIR/utils/basevalidatinglineedit.h \
-        $$LIBSDIR/utils/environment.h \
-        $$LIBSDIR/utils/pathchooser.h \
-        $$LIBSDIR/utils/savedaction.h
 
-INCLUDEPATH += $$FAKEVIMHOME $$LIBSDIR
+HEADERS += $$FAKEVIMDIR/fakevimhandler.h \
+            $$FAKEVIMDIR/fakevimactions.h \
+            $$FAKEVIMDIR/fakevimsyntax.h \
+
+INCLUDEPATH += $$FAKEVIMDIR $$LIBSDIR
 

tests/manual/preprocessor/preprocessor.pro

@@ -2,7 +2,7 @@ QT = core
 macx:CONFIG -= app_bundle
 TARGET = pp
 
-include(../../../src/libs/cplusplus/cplusplus-lib.pri)
+include(../../../src/libs/cplusplus/cplusplus.pri)
 
 # Input
 SOURCES += main.cpp

tests/tools/cplusplus-dump/cplusplus-dump.pro

@@ -2,7 +2,7 @@ QT = core gui
 macx:CONFIG -= app_bundle
 TARGET = cplusplus0
 
-include(../../../src/libs/cplusplus/cplusplus-lib.pri)
+include(../../../src/libs/cplusplus/cplusplus.pri)
 
 # Input
 SOURCES += main.cpp

tests/tools/qml-ast2dot/main.cpp

@@ -113,7 +113,7 @@ protected:
         QByteArray t;
         t.append(id);
         t.append(" [label = \"");
-        t.append(spell(token));
+        t.append(spell(token).toUtf8());
         t.append("\" shape=rect]");
         _terminalShapes.append(t);
     }

tests/tools/qml-ast2dot/qml-ast2dot.pro

@@ -1,11 +1,10 @@
+include(../../../qtcreator.pri)
 QT = core gui
 macx:CONFIG -= app_bundle
 TARGET = qml-ast2dot
 
-include(../../../src/libs/qmljs/qmljs-lib.pri)
+include($$IDE_SOURCE_TREE/src/libs/qmljs/qmljs-lib.pri)
-
+include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
-SOURCES += ../../../src/libs/utils/changeset.cpp
-HEADERS += ../../../src/libs/utils/changeset.h
 
 # Input
 SOURCES += main.cpp