Commit 176115a0 authored by Kai Koehne's avatar Kai Koehne
Browse files

QmlDesigner: Fix compilation of core tests for non -nokia-developer builds

Use explicit DEFINE to enable additional API in node instances for testing,
not QT_BUILD_INTERNAL.
parent 520108cb
...@@ -135,7 +135,7 @@ public: ...@@ -135,7 +135,7 @@ public:
static void registerDeclarativeTypes(); static void registerDeclarativeTypes();
#ifdef QT_BUILD_INTERNAL #ifdef QTCREATOR_TEST
QObject* testHandle() const; QObject* testHandle() const;
#endif #endif
private: // functions private: // functions
......
...@@ -622,7 +622,7 @@ void NodeInstance::registerDeclarativeTypes() ...@@ -622,7 +622,7 @@ void NodeInstance::registerDeclarativeTypes()
qmlRegisterType<QmlDesigner::Internal::QmlPropertyChangesObject>(); qmlRegisterType<QmlDesigner::Internal::QmlPropertyChangesObject>();
} }
#ifdef QT_BUILD_INTERNAL #ifdef QTCREATOR_TEST
QObject* NodeInstance::testHandle() const QObject* NodeInstance::testHandle() const
{ {
return internalObject(); return internalObject();
......
...@@ -8,7 +8,7 @@ include(../../../../../src/libs/qmljs/qmljs-lib.pri) ...@@ -8,7 +8,7 @@ include(../../../../../src/libs/qmljs/qmljs-lib.pri)
HEADERS+=../../../../../src/libs/utils/changeset.h HEADERS+=../../../../../src/libs/utils/changeset.h
SOURCES+=../../../../../src/libs/utils/changeset.cpp SOURCES+=../../../../../src/libs/utils/changeset.cpp
INCLUDEPATH+=../../../../../src/libs INCLUDEPATH+=../../../../../src/libs
DEFINES+=QTCREATOR_UTILS_STATIC_LIB QML_BUILD_STATIC_LIB DEFINES+=QTCREATOR_UTILS_STATIC_LIB QML_BUILD_STATIC_LIB QTCREATOR_TEST
DEPENDPATH += .. DEPENDPATH += ..
DEPENDPATH += ../../../../../src/plugins/qmldesigner/core/include DEPENDPATH += ../../../../../src/plugins/qmldesigner/core/include
......
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