diff options
| author | Thomas Hartmann <Thomas.Hartmann@theqtcompany.com> | 2016-06-08 20:21:24 +0200 |
|---|---|---|
| committer | Thomas Hartmann <Thomas.Hartmann@theqtcompany.com> | 2016-06-10 11:57:06 +0000 |
| commit | 568e80b591e143cc3c3ce944cd7ca9e989eee613 (patch) | |
| tree | c953f3af89e11526fdf4af13e9afda4c4dd2f092 /tests/auto/qml/qmldesigner/coretests/coretests.pro | |
| parent | ec80aa80bd5fb1bbf100a77b99a299cfe2571bb3 (diff) | |
QmlDesigner: get tests compiling and running
105 passing, 1 failing, one test seems flaky
I skip many nodeinstance/puppet related tests,
because the tests/test framework cannot deal with the qml2puppet/emulation
layer being out of process.
Change-Id: I5b254c7e6e944b8fbd8ba490c1e8bb43d0eb38c3
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Diffstat (limited to 'tests/auto/qml/qmldesigner/coretests/coretests.pro')
| -rw-r--r-- | tests/auto/qml/qmldesigner/coretests/coretests.pro | 45 |
1 files changed, 24 insertions, 21 deletions
diff --git a/tests/auto/qml/qmldesigner/coretests/coretests.pro b/tests/auto/qml/qmldesigner/coretests/coretests.pro index bd2f0f21687..af6a55753f7 100644 --- a/tests/auto/qml/qmldesigner/coretests/coretests.pro +++ b/tests/auto/qml/qmldesigner/coretests/coretests.pro @@ -1,18 +1,17 @@ -IDE_SOURCE_TREE=$$PWD/../../../../.. -IDE_BUILD_TREE=$$OUT_PWD/../../../../.. -# can we check that this is a valid build dir? -OUT_PWD_SAVE=$$OUT_PWD -OUT_PWD=IDE_BUILD_TREE -include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/config.pri) -include(../../../qttest.pri) -OUT_PWD=$$OUT_PWD_SAVE -LIBS *= -L$$IDE_PLUGIN_PATH -LIBS *= -L$$IDE_LIBRARY_PATH +QTC_LIB_DEPENDS += \ + utils \ + qmljs \ + qmleditorwidgets \ + cplusplus -unix: QMAKE_LFLAGS += \'-Wl,-rpath,$${IDE_LIBRARY_PATH}\' \'-Wl,-rpath,$${IDE_PLUGIN_PATH}\' +QTC_PLUGIN_DEPENDS += \ + coreplugin \ + qmljseditor -QT += script \ - network +include(../../../qttest.pri) +include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/config.pri) + +QT += network core-private greaterThan(QT_MAJOR_VERSION, 4) { QT += printsupport @@ -22,22 +21,26 @@ greaterThan(QT_MAJOR_VERSION, 4) { contains(QT_CONFIG, webkit): QT += webkit } - -# DEFINES+=QTCREATOR_UTILS_STATIC_LIB QML_BUILD_STATIC_LIB DEFINES+=QTCREATORDIR=\\\"$$IDE_BUILD_TREE\\\" -DEFINES += QTCREATOR_TEST QMLDESIGNER_TEST +DEFINES += QTCREATOR_TEST +DEFINES += QMLDESIGNER_TEST +DEFINES += QT_RESTRICTED_CAST_FROM_ASCII 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 - +INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/components/integration +INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/components/componentcore +INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/components/itemlibrary +INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/components/navigator +INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/components/stateseditor +INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/components/formeditor +INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/components/propertyeditor +INCLUDEPATH += $$IDE_SOURCE_TREE/src/plugins/qmldesigner/components/debugview +INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/3rdparty include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/designercore/designercore-lib.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 |