philipp/KDDockWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qtquick: Move m_qmlEngine from Config to Platform_qtquick

Browse Source 
As it's QtQuick specific it should be in the qtquick frontend folder.
This commit is contained in:
Sergio Martins
2022-05-08 20:16:23 +01:00
parent 3c340aee40
commit cfeb59ee8f
7 changed files with 46 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/qtquick/Platform_qtquick.cpp
View File

@@ -17,6 +17,9 @@
#include "Window_qtquick.h"
#include "views/View_qtquick.h"
#include "qtquick/Window_qtquick.h"
#include "private/DockRegistry_p.h"
#include "private/DragController_p.h"
#include "FrameworkWidgetFactory.h"
#include <QQmlEngine>
#include <QQuickStyle>
@@ -25,10 +28,11 @@
#include <QScreen>
#include <QQuickItem>
#include <QGuiApplication>
#include <QQmlContext>
using namespace KDDockWidgets;
QQmlEngine *Platform_qtquick::m_qmlEngine = nullptr;
// QQmlEngine *Platform_qtquick::m_qmlEngine = nullptr;
Platform_qtquick::Platform_qtquick()
{
@@ -106,3 +110,31 @@ QSize Platform_qtquick::screenSizeFor(View *view) const
return {};
}
QQmlEngine *Platform_qtquick::qmlEngine() const
{
if (!m_qmlEngine)
qWarning() << "Please call KDDockWidgets::Platform_qtquick::self()->setQmlEngine(engine)";
return m_qmlEngine;
}
void Platform_qtquick::setQmlEngine(QQmlEngine *qmlEngine)
{
if (m_qmlEngine) {
qWarning() << Q_FUNC_INFO << "Already has QML engine";
return;
}
if (!qmlEngine) {
qWarning() << Q_FUNC_INFO << "Null QML engine";
return;
}
auto dr = DockRegistry::self(); // make sure our QML types are registered
QQmlContext *context = qmlEngine->rootContext();
context->setContextProperty(QStringLiteral("_kddwHelpers"), &m_qquickHelpers);
context->setContextProperty(QStringLiteral("_kddwDockRegistry"), dr);
context->setContextProperty(QStringLiteral("_kddwDragController"), DragController::instance());
context->setContextProperty(QStringLiteral("_kddw_widgetFactory"), Config::self().frameworkWidgetFactory());
}