From 22fcfb0d6f9f44e77e9cd81c3ed075c9974f1d53 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Mon, 17 Aug 2020 13:39:21 +0200 Subject: [PATCH] QmlDesigner: Fix compilation of coretests This reverts commit 7856c2c2f025787f0b0f588bf6a01bf0fa48beea. There were files compiled which are not used in the tests but have external dependencies. So instead of using the preprocessor we simply don't link the source files in the project. Change-Id: Ibba4a1dace1868b016af7135262c795bb29af204 Reviewed-by: Thomas Hartmann --- .../instances/nodeinstanceclientproxy.h | 2 ++ .../designercore/designercore-lib.pri | 2 +- .../designercore/include/nodeinstanceview.h | 2 +- .../designercore/instances/instances-lib.pri | 22 ++++++++++++++++ .../designercore/instances/instances.pri | 26 +++---------------- .../interactiveconnectionmanager.cpp | 6 ----- .../instances/nodeinstanceview.cpp | 7 ++--- .../designercore/instances/puppetcreator.cpp | 5 ++-- src/plugins/qmldesigner/qmldesignerplugin.pro | 1 + 9 files changed, 35 insertions(+), 38 deletions(-) create mode 100644 src/plugins/qmldesigner/designercore/instances/instances-lib.pri diff --git a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.h b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.h index 2131109e463..c034435be8c 100644 --- a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.h +++ b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.h @@ -33,6 +33,8 @@ #include #include +#include + QT_BEGIN_NAMESPACE class QLocalSocket; class QIODevice; diff --git a/src/plugins/qmldesigner/designercore/designercore-lib.pri b/src/plugins/qmldesigner/designercore/designercore-lib.pri index 7fc663f4af0..08842527eec 100644 --- a/src/plugins/qmldesigner/designercore/designercore-lib.pri +++ b/src/plugins/qmldesigner/designercore/designercore-lib.pri @@ -7,7 +7,7 @@ DEFINES += DESIGNER_CORE_LIBRARY INCLUDEPATH += $$PWD \ $$PWD/include -include (instances/instances.pri) +include (instances/instances-lib.pri) include (../../../../share/qtcreator/qml/qmlpuppet/interfaces/interfaces.pri) include (../../../../share/qtcreator/qml/qmlpuppet/commands/commands.pri) include (../../../../share/qtcreator/qml/qmlpuppet/container/container.pri) diff --git a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h index e29b768ea8f..7ab1fc98083 100644 --- a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h +++ b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h @@ -41,7 +41,7 @@ #include #include -#include +#include namespace ProjectExplorer { class Target; diff --git a/src/plugins/qmldesigner/designercore/instances/instances-lib.pri b/src/plugins/qmldesigner/designercore/instances/instances-lib.pri new file mode 100644 index 00000000000..0f55de791e4 --- /dev/null +++ b/src/plugins/qmldesigner/designercore/instances/instances-lib.pri @@ -0,0 +1,22 @@ +INCLUDEPATH += $$PWD/ + +HEADERS += $$PWD/../include/nodeinstance.h \ + $$PWD/baseconnectionmanager.h \ + $$PWD/connectionmanager.h \ + $$PWD/connectionmanagerinterface.h \ + $$PWD/nodeinstanceserverproxy.h \ + $$PWD/puppetcreator.h \ + $$PWD/puppetbuildprogressdialog.h \ + $$PWD/qprocessuniqueptr.h + +SOURCES += $$PWD/nodeinstanceserverproxy.cpp \ + $$PWD/baseconnectionmanager.cpp \ + $$PWD/connectionmanager.cpp \ + $$PWD/connectionmanagerinterface.cpp \ + $$PWD/nodeinstance.cpp \ + $$PWD/nodeinstanceview.cpp \ + $$PWD/puppetcreator.cpp \ + $$PWD/puppetbuildprogressdialog.cpp + +FORMS += $$PWD/puppetbuildprogressdialog.ui + diff --git a/src/plugins/qmldesigner/designercore/instances/instances.pri b/src/plugins/qmldesigner/designercore/instances/instances.pri index 7d6b71a080f..92a2c027dfa 100644 --- a/src/plugins/qmldesigner/designercore/instances/instances.pri +++ b/src/plugins/qmldesigner/designercore/instances/instances.pri @@ -1,25 +1,7 @@ INCLUDEPATH += $$PWD/ -HEADERS += $$PWD/../include/nodeinstance.h \ - $$PWD/baseconnectionmanager.h \ - $$PWD/capturingconnectionmanager.h \ - $$PWD/connectionmanager.h \ - $$PWD/connectionmanagerinterface.h \ - $$PWD/interactiveconnectionmanager.h \ - $$PWD/nodeinstanceserverproxy.h \ - $$PWD/puppetcreator.h \ - $$PWD/puppetbuildprogressdialog.h \ - $$PWD/qprocessuniqueptr.h +HEADERS += $$PWD/capturingconnectionmanager.h \ + $$PWD/interactiveconnectionmanager.h -SOURCES += $$PWD/nodeinstanceserverproxy.cpp \ - $$PWD/baseconnectionmanager.cpp \ - $$PWD/capturingconnectionmanager.cpp \ - $$PWD/connectionmanager.cpp \ - $$PWD/connectionmanagerinterface.cpp \ - $$PWD/interactiveconnectionmanager.cpp \ - $$PWD/nodeinstance.cpp \ - $$PWD/nodeinstanceview.cpp \ - $$PWD/puppetcreator.cpp \ - $$PWD/puppetbuildprogressdialog.cpp - -FORMS += $$PWD/puppetbuildprogressdialog.ui +SOURCES += $$PWD/capturingconnectionmanager.cpp \ + $$PWD/interactiveconnectionmanager.cpp diff --git a/src/plugins/qmldesigner/designercore/instances/interactiveconnectionmanager.cpp b/src/plugins/qmldesigner/designercore/instances/interactiveconnectionmanager.cpp index e90d57640d9..6da44603df8 100644 --- a/src/plugins/qmldesigner/designercore/instances/interactiveconnectionmanager.cpp +++ b/src/plugins/qmldesigner/designercore/instances/interactiveconnectionmanager.cpp @@ -27,9 +27,7 @@ #include "nodeinstanceserverproxy.h" #include "nodeinstanceview.h" -#ifndef QMLDESIGNER_TEST #include -#endif #include @@ -51,7 +49,6 @@ void InteractiveConnectionManager::setUp(NodeInstanceServerProxy *nodeInstanceSe { ConnectionManager::setUp(nodeInstanceServerProxy, qrcMappingString, target); -#ifndef QMLDESIGNER_TEST DesignerSettings settings = QmlDesignerPlugin::instance()->settings(); int timeOutTime = settings.value(DesignerSettingsKey::PUPPET_KILL_TIMEOUT).toInt(); for (Connection &connection : m_connections) @@ -68,7 +65,6 @@ void InteractiveConnectionManager::setUp(NodeInstanceServerProxy *nodeInstanceSe }); } } -#endif } void InteractiveConnectionManager::showCannotConnectToPuppetWarningAndSwitchToEditMode() @@ -78,11 +74,9 @@ void InteractiveConnectionManager::showCannotConnectToPuppetWarningAndSwitchToEd tr("The executable of the QML emulation layer (QML Puppet) may not be responding. " "Switching to another kit might help.")); -#ifndef QMLDESIGNER_TEST QmlDesignerPlugin::instance()->switchToTextModeDeferred(); nodeInstanceServerProxy()->nodeInstanceView()->emitDocumentMessage( tr("Cannot Connect to QML Emulation Layer (QML Puppet)")); -#endif } void InteractiveConnectionManager::dispatchCommand(const QVariant &command, Connection &connection) diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp index 01c924f3130..21623f865c1 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp @@ -83,11 +83,12 @@ #include #include #include -#include #endif #include +#include + #include #include @@ -551,10 +552,8 @@ void NodeInstanceView::auxiliaryDataChanged(const ModelNode &node, } } else if (node.isRootNode() && name == "language@Internal") { const QString languageAsString = value.toString(); -#ifndef QMLDESIGNER_TEST if (auto multiLanguageAspect = QmlProjectManager::QmlMultiLanguageAspect::current(m_currentTarget)) multiLanguageAspect->setCurrentLocale(languageAsString); -#endif m_nodeInstanceServer->changeLanguage({languageAsString}); } else if (node.isRootNode() && name == "previewSize@Internal") { m_nodeInstanceServer->changePreviewImageSize(value.toSize()); @@ -993,10 +992,8 @@ CreateSceneCommand NodeInstanceView::createCreateSceneCommand() } QString lastUsedLanguage; -#ifndef QMLDESIGNER_TEST if (auto multiLanguageAspect = QmlProjectManager::QmlMultiLanguageAspect::current(m_currentTarget)) lastUsedLanguage = multiLanguageAspect->currentLocale(); -#endif return CreateSceneCommand( instanceContainerList, diff --git a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp index 1992f813ac8..bdae76c0d3f 100644 --- a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp +++ b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp @@ -30,7 +30,6 @@ #include #ifndef QMLDESIGNER_TEST #include -#include #endif #include @@ -46,6 +45,8 @@ #include #include +#include + #include #include #include @@ -520,12 +521,10 @@ QProcessEnvironment PuppetCreator::processEnvironment() const customFileSelectors = m_target->additionalData("CustomFileSelectorsData").toStringList(); -#ifndef QMLDESIGNER_TEST if (auto multiLanguageAspect = QmlProjectManager::QmlMultiLanguageAspect::current(m_target)) { if (!multiLanguageAspect->databaseFilePath().isEmpty()) environment.set("QT_MULTILANGUAGE_DATABASE", multiLanguageAspect->databaseFilePath().toString()); } -#endif } customFileSelectors.append("DesignMode"); diff --git a/src/plugins/qmldesigner/qmldesignerplugin.pro b/src/plugins/qmldesigner/qmldesignerplugin.pro index 506b3d743b8..6590dcb0462 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.pro +++ b/src/plugins/qmldesigner/qmldesignerplugin.pro @@ -10,6 +10,7 @@ include(../../qtcreatorplugin.pri) include(qmldesignerplugin.pri) include(designercore/designercore-lib.pri) +include(designercore/instances/instances.pri) include(components/componentcore/componentcore.pri) include(components/integration/integration.pri) include(components/propertyeditor/propertyeditor.pri)