diff options
| author | Marco Bubke <marco.bubke@nokia.com> | 2012-09-03 17:34:28 +0200 |
|---|---|---|
| committer | Marco Bubke <marco.bubke@nokia.com> | 2012-09-03 18:02:15 +0200 |
| commit | b19bebbfa50c2cf744e9df02d27f5509abccbbed (patch) | |
| tree | 5727e75830bb0463e4a0ec0c125ab4b8ccb4ea0a /tests/auto/qml/qmldesigner/coretests/coretests.pro | |
| parent | e3eea3a935ec21f93a3817a85a69636db7ebdbaf (diff) | |
QmlDesigner.Tests: Compiling again
Change-Id: I85a7fc5c37d9beea6e2433a9fd2a3ef779f0d63c
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Diffstat (limited to 'tests/auto/qml/qmldesigner/coretests/coretests.pro')
| -rw-r--r-- | tests/auto/qml/qmldesigner/coretests/coretests.pro | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/tests/auto/qml/qmldesigner/coretests/coretests.pro b/tests/auto/qml/qmldesigner/coretests/coretests.pro index 7eb44776a4f..33fec656b63 100644 --- a/tests/auto/qml/qmldesigner/coretests/coretests.pro +++ b/tests/auto/qml/qmldesigner/coretests/coretests.pro @@ -1,15 +1,17 @@ -include(../../../qttest.pri) - -QTCREATOR_SOURCE=$$PWD/../../../../.. -QTCREATOR_BUILD=$$OUT_PWD/../../../../.. +IDE_SOURCE_TREE=$$PWD/../../../../.. +IDE_BUILD_TREE=$$OUT_PWD/../../../../.. # can we check that this is a valid build dir? - +message($$IDE_SOURCE_TREE) +message($$IDE_BUILD_TREE) OUT_PWD_SAVE=$$OUT_PWD -OUT_PWD=QTCREATOR_BUILD +OUT_PWD=IDE_BUILD_TREE include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/config.pri) +include(../../../qttest.pri) OUT_PWD=$$OUT_PWD_SAVE - +message($$IDE_LIBRARY_PATH) +message($$IDE_PLUGIN_PATH) LIBS += -L$$IDE_PLUGIN_PATH/Nokia +LIBS += -L$$IDE_LIBRARY_PATH unix: QMAKE_LFLAGS += \'-Wl,-rpath,$${IDE_LIBRARY_PATH}\' \'-Wl,-rpath,$${IDE_PLUGIN_PATH}/Nokia\' @@ -24,10 +26,15 @@ DEFINES+=QT_CREATOR QTCREATOR_TEST INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore/include INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore +INCLUDEPATH += $$IDE_SOURCE_TREE//share/qtcreator/qml/qmlpuppet +INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner + include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore/designercore.pri) -include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri) include($$IDE_SOURCE_TREE/src/plugins/qmljstools/qmljstools.pri) +include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri) +include($$IDE_SOURCE_TREE/src/libs/qmljs/qmljs.pri) +include($$IDE_SOURCE_TREE/src/libs/cplusplus/cplusplus.pri) CONFIG += console CONFIG -= app_bundle |