diff options
Diffstat (limited to 'src/imports/controls/universal')
3 files changed, 6 insertions, 4 deletions
diff --git a/src/imports/controls/universal/qquickuniversalimageprovider.cpp b/src/imports/controls/universal/qquickuniversalimageprovider.cpp index a7e2411b..8e63e6d8 100644 --- a/src/imports/controls/universal/qquickuniversalimageprovider.cpp +++ b/src/imports/controls/universal/qquickuniversalimageprovider.cpp @@ -52,11 +52,11 @@ QImage QQuickUniversalImageProvider::requestImage(const QString &id, QSize *size { Q_UNUSED(requestedSize); - int sep = id.indexOf('/'); + int sep = id.indexOf(QLatin1Char('/')); QString name = id.left(sep); QString color = id.mid(sep + 1); qreal dpr = qApp->primaryScreen()->devicePixelRatio(); - QString file = qt_findAtNxFile(":/org.qt-project/imports/Qt/labs/controls/universal/images/" + name + ".png", dpr); + QString file = qt_findAtNxFile(QStringLiteral(":/org.qt-project/imports/Qt/labs/controls/universal/images/") + name + QStringLiteral(".png"), dpr); QImage image(file); if (image.isNull()) { diff --git a/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp b/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp index 835a250a..12faa564 100644 --- a/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp +++ b/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp @@ -59,13 +59,13 @@ public: void QtLabsUniversalStylePlugin::registerTypes(const char *uri) { - qmlRegisterUncreatableType<QQuickUniversalStyle>(uri, 1, 0, "Universal", "Universal is an attached property"); + qmlRegisterUncreatableType<QQuickUniversalStyle>(uri, 1, 0, "Universal", tr("Universal is an attached property")); } void QtLabsUniversalStylePlugin::initializeEngine(QQmlEngine *engine, const char *uri) { initResources(); - engine->addImageProvider("universal", new QQuickUniversalImageProvider); + engine->addImageProvider(QStringLiteral("universal"), new QQuickUniversalImageProvider); QByteArray import = QByteArray(uri) + ".impl"; qmlRegisterType<QQuickUniversalProgressRing>(import, 1, 0, "ProgressRing"); diff --git a/src/imports/controls/universal/universal.pro b/src/imports/controls/universal/universal.pro index c4a4304b..33a8473b 100644 --- a/src/imports/controls/universal/universal.pro +++ b/src/imports/controls/universal/universal.pro @@ -5,6 +5,8 @@ IMPORT_VERSION = 1.0 QT += qml quick QT += core-private gui-private qml-private quick-private labstemplates-private +DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII + OTHER_FILES += \ qmldir |