diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-08-09 13:42:56 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-08-11 07:21:26 +0000 |
| commit | 0bf6a3f4255c2e082db1f84de19034f05c48ce56 (patch) | |
| tree | 249c285f319ceb85ffe6ac38f5cd7b3808c0009c /src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp | |
| parent | 038a0c308a03977d3694e16b31c1cf7c7e1a5611 (diff) | |
Add ComboBox::flat
[ChangeLog][ComboBox] Added a flat property that provides more suitable
looks for using ComboBox in a ToolBar.
Task-number: QTBUG-54935
Change-Id: Id458a078486aeac5d542a57f3ed247d63d25e95c
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp')
| -rw-r--r-- | src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp b/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp index 77dc67a5..27d2c5a6 100644 --- a/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp +++ b/src/imports/controls/material/qtquickcontrols2materialstyleplugin.cpp @@ -44,6 +44,7 @@ #include <QtQuickControls2/private/qquickstyleselector_p.h> #include <QtQuickControls2/private/qquickpaddedrectangle_p.h> +#include <QtQuickControls2/private/qquickcolorimageprovider_p.h> static inline void initResources() { @@ -85,6 +86,8 @@ void QtQuickControls2MaterialStylePlugin::initializeEngine(QQmlEngine *engine, c { QQuickStylePlugin::initializeEngine(engine, uri); + engine->addImageProvider(name(), new QQuickColorImageProvider(QStringLiteral(":/qt-project.org/imports/QtQuick/Controls.2/Material/images"))); + QByteArray import = QByteArray(uri) + ".impl"; qmlRegisterType<QQuickPaddedRectangle>(import, 2, 0, "PaddedRectangle"); qmlRegisterRevision<QQuickPaddedRectangle, 1>(import, 2, 1); |