diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-13 03:00:42 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-13 03:00:43 +0100 |
| commit | 7d11f3c452d1d864caab54375a8ed17c0c607a26 (patch) | |
| tree | e1a76d9f33853a25be395c569c456d155b504622 /src/dialogs/plugin.cpp | |
| parent | f74c888ae8d0c04d9b1d944fe61dc9a7e86b5420 (diff) | |
| parent | 710058343297bba7cc44fa2369b7cec742f34cb2 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ieb311191b4af384a81673b5ed69c32b3b9853c9c
Diffstat (limited to 'src/dialogs/plugin.cpp')
| -rw-r--r-- | src/dialogs/plugin.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/dialogs/plugin.cpp b/src/dialogs/plugin.cpp index 2e861fa57..8ee1e65d0 100644 --- a/src/dialogs/plugin.cpp +++ b/src/dialogs/plugin.cpp @@ -140,7 +140,7 @@ public: QLatin1String("Do not create objects of type StandardIcon")); #ifndef PURE_QML_ONLY if (QGuiApplicationPrivate::platformTheme()->usePlatformNativeDialog(QPlatformTheme::MessageDialog)) - qmlRegisterType<QQuickPlatformMessageDialog>(uri, 1, 0, "MessageDialog"); + qmlRegisterType<QQuickPlatformMessageDialog1>(uri, 1, 0, "MessageDialog"); else #endif registerWidgetOrQmlImplementation<QQuickMessageDialog>(widgetsDir, qmlDir, "MessageDialog", uri, hasTopLevelWindows, 1, 1); @@ -151,7 +151,7 @@ public: // QQuickAbstractDialog::setVisible() will check if a native dialog can be shown, and // only fall back to use the QML version if showing fails. if (QGuiApplicationPrivate::platformTheme()->usePlatformNativeDialog(QPlatformTheme::FileDialog)) - registerQmlImplementation<QQuickPlatformFileDialog>(qmlDir, "FileDialog", uri, 1, 0); + registerQmlImplementation<QQuickPlatformFileDialog1>(qmlDir, "FileDialog", uri, 1, 0); else #endif registerWidgetOrQmlImplementation<QQuickFileDialog>(widgetsDir, qmlDir, "FileDialog", uri, hasTopLevelWindows, 1, 0); @@ -159,7 +159,7 @@ public: // ColorDialog #ifndef PURE_QML_ONLY if (QGuiApplicationPrivate::platformTheme()->usePlatformNativeDialog(QPlatformTheme::ColorDialog)) - qmlRegisterType<QQuickPlatformColorDialog>(uri, 1, 0, "ColorDialog"); + qmlRegisterType<QQuickPlatformColorDialog1>(uri, 1, 0, "ColorDialog"); else #endif registerWidgetOrQmlImplementation<QQuickColorDialog>(widgetsDir, qmlDir, "ColorDialog", uri, hasTopLevelWindows, 1, 0); @@ -167,7 +167,7 @@ public: // FontDialog #ifndef PURE_QML_ONLY if (QGuiApplicationPrivate::platformTheme()->usePlatformNativeDialog(QPlatformTheme::FontDialog)) - qmlRegisterType<QQuickPlatformFontDialog>(uri, 1, 1, "FontDialog"); + qmlRegisterType<QQuickPlatformFontDialog1>(uri, 1, 1, "FontDialog"); else #endif registerWidgetOrQmlImplementation<QQuickFontDialog>(widgetsDir, qmlDir, "FontDialog", uri, hasTopLevelWindows, 1, 1); |