diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2013-03-11 11:05:30 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-18 13:44:38 +0100 |
| commit | 69186a08270a9c585b19a5140a5fcf52e2bf5bc3 (patch) | |
| tree | a2d80d8c17a567d9f81ca2216bf37d7e05f874e4 /src/imports/dialogs/plugin.cpp | |
| parent | 7fded5040f56b8def7a93fcce03f93f06bcc6bc4 (diff) | |
Add ColorDialog to QtQuick.Dialogs
As with FileDialog, it tries QPA, then QColorDialog, and falls back to
a QML implementation (which is also provided here) if neither type of
native dialog is available.
Change-Id: I384928e1f7322bb6b867d4618d07c88c70e3cbfe
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src/imports/dialogs/plugin.cpp')
| -rw-r--r-- | src/imports/dialogs/plugin.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/imports/dialogs/plugin.cpp b/src/imports/dialogs/plugin.cpp index f7d72bf496..67653e5965 100644 --- a/src/imports/dialogs/plugin.cpp +++ b/src/imports/dialogs/plugin.cpp @@ -44,6 +44,9 @@ #include "qquickfiledialog_p.h" #include "qquickabstractfiledialog_p.h" #include "qquickplatformfiledialog_p.h" +#include "qquickcolordialog_p.h" +#include "qquickabstractcolordialog_p.h" +#include "qquickplatformcolordialog_p.h" #include <private/qguiapplication_p.h> //#define PURE_QML_ONLY @@ -95,6 +98,15 @@ public: #endif registerWidgetOrQmlImplementation<QQuickFileDialog>(widgetsDir, "WidgetFileDialog.qml", qmlDir, "DefaultFileDialog.qml", "FileDialog", uri); + + // ColorDialog +#ifndef PURE_QML_ONLY + if (QGuiApplicationPrivate::platformTheme()->usePlatformNativeDialog(QPlatformTheme::ColorDialog)) + qmlRegisterType<QQuickPlatformColorDialog>(uri, DIALOGS_MAJOR_MINOR, "ColorDialog"); + else +#endif + registerWidgetOrQmlImplementation<QQuickColorDialog>(widgetsDir, "WidgetColorDialog.qml", + qmlDir, "DefaultColorDialog.qml", "ColorDialog", uri); } protected: |