Add missing QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII

http://lists.qt-project.org/pipermail/development/2012-February/002001.html

Change-Id: Id6815c3bd9b196590b0c93b8ddf2f977cdc6a511
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

8 files changed, 15 insertions, 7 deletions

diff --git a/src/imports/controls/controls.pro b/src/imports/controls/controls.pro
index a7aec7e5..8d85fdb2 100644
--- a/src/imports/controls/controls.pro
+++ b/src/imports/controls/controls.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
+
 QMAKE_DOCS = $$PWD/doc/qtlabscontrols.qdocconf
 
 OTHER_FILES += \
diff --git a/src/imports/controls/material/material.pro b/src/imports/controls/material/material.pro
index 4c456665..db7490d3 100644
--- a/src/imports/controls/material/material.pro
+++ b/src/imports/controls/material/material.pro
@@ -5,6 +5,8 @@ IMPORT_VERSION = 1.0
 QT += qml quick
 QT_PRIVATE += core-private gui-private qml-private quick-private
 
+DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
+
 OTHER_FILES += \
     qmldir
 
diff --git a/src/imports/controls/material/qtquickmaterialstyleplugin.cpp b/src/imports/controls/material/qtquickmaterialstyleplugin.cpp
index 5821ac08..d50f674a 100644
--- a/src/imports/controls/material/qtquickmaterialstyleplugin.cpp
+++ b/src/imports/controls/material/qtquickmaterialstyleplugin.cpp
@@ -54,7 +54,7 @@ public:
 
 void QtQuickMaterialStylePlugin::registerTypes(const char *uri)
 {
-    qmlRegisterUncreatableType<QQuickMaterialStyle>(uri, 1, 0, "Material", "Material is an attached property");
+    qmlRegisterUncreatableType<QQuickMaterialStyle>(uri, 1, 0, "Material", tr("Material is an attached property"));
     qmlRegisterType<QQuickMaterialProgressRing>(uri, 1, 0, "ProgressRing");
     qmlRegisterType<QQuickMaterialRingAnimator>(uri, 1, 0, "RingAnimator");
 }
diff --git a/src/imports/controls/qtlabscontrolsplugin.cpp b/src/imports/controls/qtlabscontrolsplugin.cpp
index 8de92e09..6ca0f2e1 100644
--- a/src/imports/controls/qtlabscontrolsplugin.cpp
+++ b/src/imports/controls/qtlabscontrolsplugin.cpp
@@ -63,13 +63,13 @@ public:
 
 void QtLabsControlsPlugin::registerTypes(const char *uri)
 {
-    qmlRegisterUncreatableType<QQuickThemeAttached>(uri, 1, 0, "Theme", "Theme is an attached property");
+    qmlRegisterUncreatableType<QQuickThemeAttached>(uri, 1, 0, "Theme", tr("Theme is an attached property"));
 
     qmlRegisterType<QQuickButtonGroup>(uri, 1, 0, "ButtonGroup");
     qmlRegisterType<QQuickButtonGroupAttached>();
 
     QCommandLineParser parser;
-    QCommandLineOption styleOption(QStringList() << "s" << "style", tr("the style to use for the application"), tr("style"));
+    QCommandLineOption styleOption(QStringList() << QStringLiteral("s") << QStringLiteral("style"), tr("the style to use for the application"), tr("style"));
     parser.addOption(styleOption);
     parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
     parser.parse(QCoreApplication::arguments());
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
 
diff --git a/src/imports/templates/templates.pro b/src/imports/templates/templates.pro
index e49486f7..c83e7833 100644
--- a/src/imports/templates/templates.pro
+++ b/src/imports/templates/templates.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