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

qmlpuppet: remove qmlprivategate DesignerSupport < Qt 5.6

Browse Source 
Task-number: QTCREATORBUG-26600
Change-Id: I629c8cd1f497ed2dd354ff461aa890a77bdc2a01
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Tim Jenssen
2022-07-11 14:10:13 +02:00
parent a74582a9d3
commit d6c10e775d
25 changed files with 430 additions and 2134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/qtcreator/qml/qmlpuppet/qml2puppet/iconrenderer/iconrenderer.cpp
View File

@@ -24,9 +24,11 @@
****************************************************************************/
#include "iconrenderer.h"
#include "../editor3d/selectionboxgeometry.h"
#include "../editor3d/generalhelper.h"
#include <private/qquickdesignersupport_p.h>
#include <QtQml/qqmlcomponent.h>
#include <QtQml/qqmlengine.h>
#include <QtQml/qqmlproperty.h>
@@ -63,7 +65,7 @@ IconRenderer::IconRenderer(int size, const QString &filePath, const QString &sou
void IconRenderer::setupRender()
{
DesignerSupport::activateDesignerMode();
QQuickDesignerSupport::activateDesignerMode();
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
DesignerSupport::activateDesignerWindowManager();
#endif

5
share/qtcreator/qml/qmlpuppet/qml2puppet/iconrenderer/iconrenderer.h
View File

@@ -28,11 +28,10 @@
#include <QtCore/qobject.h>
#include <QtCore/qstring.h>
#include <designersupportdelegate.h>
QT_BEGIN_NAMESPACE
class QQuickWindow;
class QQuickItem;
class QQuickDesignerSupport;
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
class QQuickRenderControl;
class QRhi;
@@ -66,7 +65,7 @@ private:
QQuickWindow *m_window = nullptr;
QQuickItem *m_contentItem = nullptr;
QQuickItem *m_containerItem = nullptr;
DesignerSupport m_designerSupport;
std::unique_ptr<QQuickDesignerSupport> m_designerSupport;
bool m_is3D = false;
int m_focusStep = 0;
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)