From 176115a0ad646a666bff1264a485868835f1431d Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Wed, 31 Mar 2010 10:53:15 +0200
Subject: [PATCH] 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.
---
src/plugins/qmldesigner/core/include/nodeinstance.h | 2 +-
src/plugins/qmldesigner/core/instances/nodeinstance.cpp | 2 +-
tests/auto/qml/qmldesigner/coretests/coretests.pro | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/plugins/qmldesigner/core/include/nodeinstance.h b/src/plugins/qmldesigner/core/include/nodeinstance.h
index 99dcc4a768b..3c2d41a1cf2 100644
--- a/src/plugins/qmldesigner/core/include/nodeinstance.h
+++ b/src/plugins/qmldesigner/core/include/nodeinstance.h
@@ -135,7 +135,7 @@ public:
static void registerDeclarativeTypes();
-#ifdef QT_BUILD_INTERNAL
+#ifdef QTCREATOR_TEST
QObject* testHandle() const;
#endif
private: // functions
diff --git a/src/plugins/qmldesigner/core/instances/nodeinstance.cpp b/src/plugins/qmldesigner/core/instances/nodeinstance.cpp
index 72f4fbd6058..ab6a061f8f4 100644
--- a/src/plugins/qmldesigner/core/instances/nodeinstance.cpp
+++ b/src/plugins/qmldesigner/core/instances/nodeinstance.cpp
@@ -622,7 +622,7 @@ void NodeInstance::registerDeclarativeTypes()
qmlRegisterType<QmlDesigner::Internal::QmlPropertyChangesObject>();
}
-#ifdef QT_BUILD_INTERNAL
+#ifdef QTCREATOR_TEST
QObject* NodeInstance::testHandle() const
{
return internalObject();
diff --git a/tests/auto/qml/qmldesigner/coretests/coretests.pro b/tests/auto/qml/qmldesigner/coretests/coretests.pro
index c4a7de34a7d..b86c605445a 100644
--- a/tests/auto/qml/qmldesigner/coretests/coretests.pro
+++ b/tests/auto/qml/qmldesigner/coretests/coretests.pro
@@ -8,7 +8,7 @@ include(../../../../../src/libs/qmljs/qmljs-lib.pri)
HEADERS+=../../../../../src/libs/utils/changeset.h
SOURCES+=../../../../../src/libs/utils/changeset.cpp
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 += ../../../../../src/plugins/qmldesigner/core/include
--
GitLab