feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

tests: Make them compile again properly

Browse Source
This commit is contained in:
Bill King
2011-04-07 09:10:37 +02:00
parent cd9aec6df9
commit 4e7ad2a1b7
12 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/auto/debugger/tst_dumpers.cpp
View File

@@ -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));
}

3
tests/manual/cplusplus-frontend/cplusplus-frontend.pro
View File

@@ -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

2
tests/manual/fakevim/fakevim.pro
View File

@@ -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

2
tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp
View File

@@ -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>

4
tests/manual/preprocessor/preprocessor.pro
View File

@@ -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

2
tests/manual/process/process.pro
View File

@@ -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

1
tests/tools/qml-ast2dot/qml-ast2dot.pro
View File

@@ -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

5
tests/valgrind/callgrind/callgrindparsertests.pro
View File

@@ -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

5
tests/valgrind/callgrind/modeltest.pro
View File

@@ -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

8
tests/valgrind/memcheck/modeldemo.pro
View File

@@ -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

10
tests/valgrind/memcheck/parsertests.pro
View File

@@ -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

10
tests/valgrind/memcheck/testrunner.pro
View File

@@ -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