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/widgets/widgetsplugin.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/widgets/widgetsplugin.cpp')
-rw-r--r-- | src/imports/widgets/widgetsplugin.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/imports/widgets/widgetsplugin.cpp b/src/imports/widgets/widgetsplugin.cpp index 6d3a56ca27..a29c9b3609 100644 --- a/src/imports/widgets/widgetsplugin.cpp +++ b/src/imports/widgets/widgetsplugin.cpp @@ -42,6 +42,7 @@ #include <QtQml/qqmlextensionplugin.h> #include <QtQml/qqml.h> #include "qquickqfiledialog_p.h" +#include "qquickqcolordialog_p.h" QT_BEGIN_NAMESPACE @@ -75,6 +76,7 @@ public: Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick.PrivateWidgets")); qmlRegisterType<QQuickQFileDialog>(uri, 1, 0, "QtFileDialog"); + qmlRegisterType<QQuickQColorDialog>(uri, 1, 0, "QtColorDialog"); } }; |