diff options
| -rw-r--r-- | src/controls/controls.pri | 2 | ||||
| -rw-r--r-- | src/controls/qquickcolorimageprovider.cpp (renamed from src/imports/controls/universal/qquickuniversalimageprovider.cpp) | 11 | ||||
| -rw-r--r-- | src/controls/qquickcolorimageprovider_p.h (renamed from src/imports/controls/universal/qquickuniversalimageprovider_p.h) | 13 | ||||
| -rw-r--r-- | src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp | 4 | ||||
| -rw-r--r-- | src/imports/controls/universal/universal.pri | 2 |
5 files changed, 18 insertions, 14 deletions
diff --git a/src/controls/controls.pri b/src/controls/controls.pri index 005ee839..7aa9447f 100644 --- a/src/controls/controls.pri +++ b/src/controls/controls.pri @@ -1,4 +1,5 @@ HEADERS += \ + $$PWD/qquickcolorimageprovider_p.h \ $$PWD/qquickproxytheme_p.h \ $$PWD/qquickstyle_p.h \ $$PWD/qquickstyleselector_p.h \ @@ -6,6 +7,7 @@ HEADERS += \ $$PWD/qquickpaddedrectangle_p.h SOURCES += \ + $$PWD/qquickcolorimageprovider.cpp \ $$PWD/qquickproxytheme.cpp \ $$PWD/qquickstyle.cpp \ $$PWD/qquickstyleselector.cpp \ diff --git a/src/imports/controls/universal/qquickuniversalimageprovider.cpp b/src/controls/qquickcolorimageprovider.cpp index 7cb7b926..582b73ed 100644 --- a/src/imports/controls/universal/qquickuniversalimageprovider.cpp +++ b/src/controls/qquickcolorimageprovider.cpp @@ -34,7 +34,7 @@ ** ****************************************************************************/ -#include "qquickuniversalimageprovider_p.h" +#include "qquickcolorimageprovider_p.h" #include <QtCore/qdebug.h> #include <QtGui/qpainter.h> @@ -44,11 +44,12 @@ QT_BEGIN_NAMESPACE -QQuickUniversalImageProvider::QQuickUniversalImageProvider() : QQuickImageProvider(Image) +QQuickColorImageProvider::QQuickColorImageProvider(const QString &path) + : QQuickImageProvider(Image), m_path(path) { } -QImage QQuickUniversalImageProvider::requestImage(const QString &id, QSize *size, const QSize &requestedSize) +QImage QQuickColorImageProvider::requestImage(const QString &id, QSize *size, const QSize &requestedSize) { Q_UNUSED(requestedSize); @@ -56,11 +57,11 @@ QImage QQuickUniversalImageProvider::requestImage(const QString &id, QSize *size QString name = id.left(sep); QString color = id.mid(sep + 1); qreal dpr = qApp->primaryScreen()->devicePixelRatio(); - QString file = qt_findAtNxFile(QStringLiteral(":/qt-project.org/imports/Qt/labs/controls/universal/images/") + name + QStringLiteral(".png"), dpr); + QString file = qt_findAtNxFile(m_path + QLatin1Char('/') + name + QStringLiteral(".png"), dpr); QImage image(file); if (image.isNull()) { - qWarning() << "QQuickUniversalImageProvider: unknown id:" << id; + qWarning() << "QQuickColorImageProvider: unknown id:" << id; return QImage(); } diff --git a/src/imports/controls/universal/qquickuniversalimageprovider_p.h b/src/controls/qquickcolorimageprovider_p.h index 15648157..2d2d3094 100644 --- a/src/imports/controls/universal/qquickuniversalimageprovider_p.h +++ b/src/controls/qquickcolorimageprovider_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QQUICKUNIVERSALIMAGEPROVIDER_P_H -#define QQUICKUNIVERSALIMAGEPROVIDER_P_H +#ifndef QQUICKCOLORIMAGEPROVIDER_P_H +#define QQUICKCOLORIMAGEPROVIDER_P_H // // W A R N I N G @@ -52,14 +52,17 @@ QT_BEGIN_NAMESPACE -class QQuickUniversalImageProvider : public QQuickImageProvider +class QQuickColorImageProvider : public QQuickImageProvider { public: - QQuickUniversalImageProvider(); + QQuickColorImageProvider(const QString &path); QImage requestImage(const QString &id, QSize *size, const QSize &requestedSize) Q_DECL_OVERRIDE; + +private: + QString m_path; }; QT_END_NAMESPACE -#endif // QQUICKUNIVERSALIMAGEPROVIDER_P_H +#endif // QQUICKOCOLORIMAGEPROVIDER_P_H diff --git a/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp b/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp index 605c06e5..6e202ce6 100644 --- a/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp +++ b/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp @@ -36,13 +36,13 @@ #include <QtQml/qqmlextensionplugin.h> #include "qquickuniversalfocusrectangle_p.h" -#include "qquickuniversalimageprovider_p.h" #include "qquickuniversalprogressring_p.h" #include "qquickuniversalprogressstrip_p.h" #include "qquickuniversalstyle_p.h" #include "qquickuniversaltheme_p.h" #include <QtGui/private/qguiapplication_p.h> +#include <QtLabsControls/private/qquickcolorimageprovider_p.h> #include <QtLabsControls/private/qquickstyleselector_p.h> static inline void initResources() @@ -102,7 +102,7 @@ void QtLabsUniversalStylePlugin::initializeEngine(QQmlEngine *engine, const char } } - engine->addImageProvider(QStringLiteral("universal"), new QQuickUniversalImageProvider); + engine->addImageProvider(QStringLiteral("universal"), new QQuickColorImageProvider(QStringLiteral(":/qt-project.org/imports/Qt/labs/controls/universal/images"))); QByteArray import = QByteArray(uri) + ".impl"; qmlRegisterType<QQuickUniversalFocusRectangle>(import, 1, 0, "FocusRectangle"); diff --git a/src/imports/controls/universal/universal.pri b/src/imports/controls/universal/universal.pri index 8736d352..e576367a 100644 --- a/src/imports/controls/universal/universal.pri +++ b/src/imports/controls/universal/universal.pri @@ -32,7 +32,6 @@ QML_FILES += \ HEADERS += \ $$PWD/qquickuniversalfocusrectangle_p.h \ - $$PWD/qquickuniversalimageprovider_p.h \ $$PWD/qquickuniversalprogressring_p.h \ $$PWD/qquickuniversalprogressstrip_p.h \ $$PWD/qquickuniversalstyle_p.h \ @@ -40,7 +39,6 @@ HEADERS += \ SOURCES += \ $$PWD/qquickuniversalfocusrectangle.cpp \ - $$PWD/qquickuniversalimageprovider.cpp \ $$PWD/qquickuniversalprogressring.cpp \ $$PWD/qquickuniversalprogressstrip.cpp \ $$PWD/qquickuniversalstyle.cpp \ |