diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-04-20 14:40:42 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-04-21 05:43:13 +0000 |
| commit | 05f6b386f9e49d263c47a1b5cce668bbc964f32e (patch) | |
| tree | 23fe4dc9086b34ccb9dcc14fe1675a6231ae391c /src/imports/controls/qtquickcontrols2plugin.cpp | |
| parent | 3090b31c4a99bf725baa0996b49ae9d31124bf76 (diff) | |
Default: use QQuickColorImageProvider
This way we don't need to duplicate all images that are built into the
main controls plugin's resources.
In order to make them work with QQuickColorImageProvider, some of the
images had to be converted from Format_Indexed8 to Format_ARGB32:
QPainter::begin: Cannot paint on an image with the QImage::Format_Indexed8 format
QPainter::setCompositionMode: Painter not active
Change-Id: I67f8820e803ef7ff29ce60460ed4ca5bb2fad4cb
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/qtquickcontrols2plugin.cpp')
| -rw-r--r-- | src/imports/controls/qtquickcontrols2plugin.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp index 672e6591..c6982062 100644 --- a/src/imports/controls/qtquickcontrols2plugin.cpp +++ b/src/imports/controls/qtquickcontrols2plugin.cpp @@ -48,6 +48,7 @@ #include <QtQuickTemplates2/private/qquickpopup_p.h> #include <QtQuickControls2/private/qquickstyleplugin_p.h> #include <QtQuickControls2/private/qquickstyleselector_p.h> +#include <QtQuickControls2/private/qquickcolorimageprovider_p.h> #include "qquickbusyindicatorring_p.h" #include "qquickdialring_p.h" @@ -137,9 +138,10 @@ void QtQuickControls2Plugin::registerTypes(const char *uri) void QtQuickControls2Plugin::initializeEngine(QQmlEngine *engine, const char *uri) { - Q_UNUSED(engine); Q_UNUSED(uri); + engine->addImageProvider(QStringLiteral("default"), new QQuickColorImageProvider(QStringLiteral(":/qt-project.org/imports/Qt/labs/controls/images"))); + const QByteArray import = QByteArray(uri) + ".impl"; qmlRegisterType<QQuickBusyIndicatorRing>(import, 1, 0, "BusyRing"); qmlRegisterType<QQuickBusyIndicatorAnimator>(import, 1, 0, "BusyRingAnimator"); |