Commit 16dc934a authored by Bill King's avatar Bill King
Browse files

Fixes autotests for windows.

parent 8926f716
......@@ -3,13 +3,6 @@ include(../shared/shared.pri)
SRCDIR = ../../../../src
SOURCES += \
tst_codeformatter.cpp \
$$SRCDIR/plugins/cpptools/cppcodeformatter.cpp \
$$SRCDIR/plugins/texteditor/basetextdocumentlayout.cpp
HEADERS += \
$$SRCDIR/plugins/cpptools/cppcodeformatter.h \
$$SRCDIR/plugins/texteditor/basetextdocumentlayout.h
SOURCES += tst_codeformatter.cpp
INCLUDEPATH += $$SRCDIR/plugins $$SRCDIR/libs
......@@ -30,6 +30,7 @@
#include "plugin1.h"
#include <QtCore/qplugin.h>
#include <QStringList>
using namespace Plugin1;
......
......@@ -14,3 +14,6 @@ COPYFILES = $$OTHER_FILES
include(../../../copy.pri)
TARGET = $$qtLibraryName(plugin1)
DESTDIR = $$OUT_PWD/../lib
LIBS += -L$$OUT_PWD/../lib
......@@ -14,3 +14,6 @@ COPYFILES = $$OTHER_FILES
include(../../../copy.pri)
TARGET = $$qtLibraryName(plugin2)
DESTDIR = $$OUT_PWD/../lib
LIBS += -L$$OUT_PWD/../lib
......@@ -14,3 +14,6 @@ COPYFILES = $$OTHER_FILES
include(../../../copy.pri)
TARGET = $$qtLibraryName(plugin3)
DESTDIR = $$OUT_PWD/../lib
LIBS += -L$$OUT_PWD/../lib
......@@ -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}/../plugin3
QMAKE_RPATHDIR += $$OUT_PWD/../lib
}
......@@ -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}/
}
......
......@@ -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
}
......@@ -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
......
......@@ -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
......
FAKEVIMHOME = ../../../src/plugins/fakevim
LIBSDIR = ../../../src/libs
include(../../../qtcreator.pri)
include(../../../src/libs/utils/utils.pri)
SOURCES += \
main.cpp \
$$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
FAKEVIMDIR = $$IDE_SOURCE_TREE/src/plugins/fakevim
LIBSDIR = $$IDE_SOURCE_TREE/src/libs
HEADERS += \
$$FAKEVIMHOME/fakevimhandler.h \
$$FAKEVIMHOME/fakevimactions.h \
$$FAKEVIMHOME/fakevimsyntax.h \
$$LIBSDIR/utils/basevalidatinglineedit.h \
$$LIBSDIR/utils/environment.h \
$$LIBSDIR/utils/pathchooser.h \
$$LIBSDIR/utils/savedaction.h
SOURCES += main.cpp \
$$FAKEVIMDIR/fakevimhandler.cpp \
$$FAKEVIMDIR/fakevimactions.cpp \
$$FAKEVIMDIR/fakevimsyntax.cpp \
INCLUDEPATH += $$FAKEVIMHOME $$LIBSDIR
HEADERS += $$FAKEVIMDIR/fakevimhandler.h \
$$FAKEVIMDIR/fakevimactions.h \
$$FAKEVIMDIR/fakevimsyntax.h \
INCLUDEPATH += $$FAKEVIMDIR $$LIBSDIR
......@@ -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
......
......@@ -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
......
......@@ -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);
}
......
include(../../../qtcreator.pri)
QT = core gui
macx:CONFIG -= app_bundle
TARGET = qml-ast2dot
include(../../../src/libs/qmljs/qmljs-lib.pri)
SOURCES += ../../../src/libs/utils/changeset.cpp
HEADERS += ../../../src/libs/utils/changeset.h
include($$IDE_SOURCE_TREE/src/libs/qmljs/qmljs-lib.pri)
include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
# Input
SOURCES += main.cpp
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment