diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-20 03:04:14 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-20 03:04:14 +0200 |
| commit | 44fe49e573539e22709c2d5c996f1ca9ee8fd760 (patch) | |
| tree | 486d79aaee274390a23c4e9034771845c6788d16 /src/dialogs/plugin.cpp | |
| parent | 3d44442331ba6f1ba7a5d5ad9f3834993911e288 (diff) | |
| parent | 8c015b374b66c952ff43150f0ffcee433a9eb412 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I4bb2b57f7f091074b0c4d17cad4748843e806dd0
Diffstat (limited to 'src/dialogs/plugin.cpp')
| -rw-r--r-- | src/dialogs/plugin.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/dialogs/plugin.cpp b/src/dialogs/plugin.cpp index 8c10786f0..b31d233e7 100644 --- a/src/dialogs/plugin.cpp +++ b/src/dialogs/plugin.cpp @@ -40,6 +40,7 @@ #include <QtQml/qqml.h> #include <QtQml/qqmlextensionplugin.h> #include <QtQml/qqmlcomponent.h> +#include <QtQml/qqmlengine.h> #include "qquickmessagedialog_p.h" #include "qquickabstractmessagedialog_p.h" #include "qquickdialogassets_p.h" @@ -87,12 +88,6 @@ class QtQuick2DialogsPlugin : public QQmlExtensionPlugin public: QtQuick2DialogsPlugin() : QQmlExtensionPlugin(), m_useResources(true) { } - virtual void initializeEngine(QQmlEngine *engine, const char * uri) { - qCDebug(lcRegistration) << uri << m_decorationComponentUrl; - QQuickAbstractDialog::m_decorationComponent = - new QQmlComponent(engine, m_decorationComponentUrl, QQmlComponent::Asynchronous); - } - virtual void registerTypes(const char *uri) { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick.Dialogs")); bool hasTopLevelWindows = QGuiApplicationPrivate::platformIntegration()-> @@ -114,7 +109,7 @@ public: m_useResources = false; #endif #endif - m_decorationComponentUrl = m_useResources ? + QQuickAbstractDialog::m_decorationComponentUrl = m_useResources ? QUrl("qrc:/QtQuick/Dialogs/qml/DefaultWindowDecoration.qml") : #ifndef QT_STATIC QUrl::fromLocalFile(qmlDir.filePath(QString("qml/DefaultWindowDecoration.qml"))); @@ -256,7 +251,6 @@ protected: qmlRegisterType(dialogQmlPath, uri, versionMajor, versionMinor, qmlName); } - QUrl m_decorationComponentUrl; bool m_useResources; }; |