feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix custom qml2puppet build

Browse Source 
The build of a custom qml2puppet was failing, because
of utils/algorithm.h missing.
We should minimize Qt Creator dependencies in the puppet.

Change-Id: Iba8dd1a3979dbeeb1bfa860b50ba586bea20c7a7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Thomas Hartmann
2019-07-31 12:31:51 +02:00
parent c6b9f40615
commit 0f3c8a3c7b
5 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
View File

@@ -67,8 +67,6 @@
#include <tokencommand.h>
#include <removesharedmemorycommand.h>
#include <utils/algorithm.h>
#include <QDebug>
#include <QQmlEngine>
#include <QQmlApplicationEngine>
@@ -460,7 +458,7 @@ void NodeInstanceServer::setupImports(const QVector<AddImportContainer> &contain
delete m_importComponent.data();
delete m_importComponentObject.data();
const QStringList importStatementList = Utils::toList(importStatementSet);
const QStringList importStatementList = QtHelpers::toList(importStatementSet);
const QStringList fullImportStatementList(QStringList(qtQuickImport) + importStatementList);
// check possible import statements combinations

12
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.h
View File

@@ -35,6 +35,18 @@
#include "servernodeinstance.h"
#include "debugoutputcommand.h"
namespace QtHelpers {
template <class T>
QList<T>toList(const QSet<T> &set)
{
#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
return set.toList();
#else
return QList<T>(set.begin(), set.end());
#endif
}
} //QtHelpers
QT_BEGIN_NAMESPACE
class QFileSystemWatcher;
class QQmlView;

6
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
View File

@@ -60,8 +60,6 @@
#include <designersupportdelegate.h>
#include <utils/algorithm.h>
namespace QmlDesigner {
Qt5InformationNodeInstanceServer::Qt5InformationNodeInstanceServer(NodeInstanceClientInterface *nodeInstanceClient) :
@@ -169,13 +167,13 @@ void Qt5InformationNodeInstanceServer::collectItemChangesAndSendChangeCommands()
if (!informationChangedInstanceSet.isEmpty())
nodeInstanceClient()->informationChanged(
createAllInformationChangedCommand(Utils::toList(informationChangedInstanceSet)));
createAllInformationChangedCommand(QtHelpers::toList(informationChangedInstanceSet)));
if (!propertyChangedList.isEmpty())
nodeInstanceClient()->valuesChanged(createValuesChangedCommand(propertyChangedList));
if (!m_parentChangedSet.isEmpty()) {
sendChildrenChangedCommand(Utils::toList(m_parentChangedSet));
sendChildrenChangedCommand(QtHelpers::toList(m_parentChangedSet));
m_parentChangedSet.clear();
}

4
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp
View File

@@ -60,8 +60,6 @@
#include <designersupportdelegate.h>
#include <utils/algorithm.h>
namespace QmlDesigner {
Qt5RenderNodeInstanceServer::Qt5RenderNodeInstanceServer(NodeInstanceClientInterface *nodeInstanceClient) :
@@ -96,7 +94,7 @@ void Qt5RenderNodeInstanceServer::collectItemChangesAndSendChangeCommands()
clearChangedPropertyList();
if (!m_dirtyInstanceSet.isEmpty()) {
nodeInstanceClient()->pixmapChanged(createPixmapChangedCommand(Utils::toList(m_dirtyInstanceSet)));
nodeInstanceClient()->pixmapChanged(createPixmapChangedCommand(QtHelpers::toList(m_dirtyInstanceSet)));
m_dirtyInstanceSet.clear();
}

6
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5testnodeinstanceserver.cpp
View File

@@ -62,8 +62,6 @@
#include <designersupportdelegate.h>
#include <utils/algorithm.h>
namespace QmlDesigner {
Qt5TestNodeInstanceServer::Qt5TestNodeInstanceServer(NodeInstanceClientInterface *nodeInstanceClient)
@@ -291,7 +289,7 @@ void QmlDesigner::Qt5TestNodeInstanceServer::collectItemChangesAndSendChangeComm
if (!informationChangedInstanceSet.isEmpty()) {
InformationChangedCommand command
= createAllInformationChangedCommand(Utils::toList(informationChangedInstanceSet));
= createAllInformationChangedCommand(QtHelpers::toList(informationChangedInstanceSet));
command.sort();
nodeInstanceClient()->informationChanged(command);
}
@@ -302,7 +300,7 @@ void QmlDesigner::Qt5TestNodeInstanceServer::collectItemChangesAndSendChangeComm
}
if (!parentChangedSet.isEmpty())
sendChildrenChangedCommand(Utils::toList(parentChangedSet));
sendChildrenChangedCommand(QtHelpers::toList(parentChangedSet));
}
}