Merge lp:~loic.molinari/ubuntu-ui-toolkit/uitk-ascii-cast-warnings-fix into lp:ubuntu-ui-toolkit/staging

[Loïc Molinari]

Optimised QString code gen for ASCII strings known at compile-time.

That allows the compiler to optimise our code better by putting all these QStrings known at compile time in the .rodata section of the binary as well as preventing a bunch of useless processing on them. That also allows us to remove "DEFINES -= QT_ASCII_CAST_WARNINGS" from the UbuntuToolkit pro file.

Optimised QString code gen for ASCII strings known at compile-time.

That allows the compiler to optimise our code better by putting all these QStrings known at compile time in the .rodata section of the binary as well as preventing a bunch of useless processing on them. That also allows us to remove "DEFINES -= QT_ASCII_CAST_WARNINGS" from the UbuntuToolkit pro file.

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2103
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1171/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6227/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1171/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2103
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1387/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6228/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1387/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2103
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1137/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6229/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1137/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2103
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1380/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6231/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1380/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2103
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/738/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1380
        deb: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1380/artifact/artifacts/*zip*/artifacts.zip
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1387
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1171
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1137
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6232/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6231
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6228
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6227
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6229

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/738/rebuild

review: Approve (continuous-integration)

[lp:~loic.molinari/ubuntu-ui-toolkit/uitk-ascii-cast-warnings-fix]

2104. By Loïc Molinari on 2016-09-14

Merged lp:ubuntu-ui-toolkit/staging.

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2104
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1191/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6321/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1191/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2104
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1407/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6323/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1407/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2104
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1400/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6324/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1400/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2104
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1157/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6327/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1157/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2104
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/751/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1400
        deb: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1400/artifact/artifacts/*zip*/artifacts.zip
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1407
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1191
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1157
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6329/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6324
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6323
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6321
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6327

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/751/rebuild

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

Quite a big change, with all the string literals. Thanks for that!

review: Approve

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2104
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1233/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6525/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1233/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2104
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1449/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6526/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1449/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2104
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/13/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6527/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/13/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2104
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1199/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6528/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1199/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2104
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1442/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6529/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1442/rebuild

review: Approve (continuous-integration)

=== modified file 'src/UbuntuMetrics/applicationmonitor.cpp'
--- src/UbuntuMetrics/applicationmonitor.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuMetrics/applicationmonitor.cpp	2016-09-15 14:53:25 +0000
@@ -39,7 +39,7 @@
         aligned_alloc(logQueueAlignment, logQueueSize * sizeof(UMEvent)));
 
 #if !defined(QT_NO_DEBUG)
-    setObjectName(QString::fromLatin1("UbuntuMetrics logging", 21));  // Thread name.
+    setObjectName(QStringLiteral("UbuntuMetrics logging"));  // Thread name.
 #endif
     start();
 }

=== modified file 'src/UbuntuMetrics/logger.cpp'
--- src/UbuntuMetrics/logger.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuMetrics/logger.cpp	2016-09-15 14:53:25 +0000
@@ -113,8 +113,8 @@
 
         QTime timeStamp = QTime(0, 0).addMSecs(event.timeStamp / 1000000);
         QString timeString = !timeStamp.hour()
-            ? timeStamp.toString(QString::fromLatin1("mm:ss:zzz", 9))
-            : timeStamp.toString(QString::fromLatin1("hh:mm:ss:zzz", 12));
+            ? timeStamp.toString(QStringLiteral("mm:ss:zzz"))
+            : timeStamp.toString(QStringLiteral("hh:mm:ss:zzz"));
 
         switch (event.type) {
         case UMEvent::Process: {

=== modified file 'src/UbuntuToolkit/UbuntuToolkit.pro'
--- src/UbuntuToolkit/UbuntuToolkit.pro	2016-09-12 08:18:53 +0000
+++ src/UbuntuToolkit/UbuntuToolkit.pro	2016-09-15 14:53:25 +0000
@@ -240,6 +240,3 @@
     $$PWD/privates/shaders/frame.frag
 
 load(ubuntu_qt_module)
-
-# Remove the ASCII cast warnings added by qt_module.
-DEFINES -= QT_ASCII_CAST_WARNINGS

=== modified file 'src/UbuntuToolkit/adapters/actionsproxy_p.cpp'
--- src/UbuntuToolkit/adapters/actionsproxy_p.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/adapters/actionsproxy_p.cpp	2016-09-15 14:53:25 +0000
@@ -30,7 +30,7 @@
     : globalContext(new UCActionContext)
 {
     // for testing purposes
-    globalContext->setObjectName("GlobalActionContext");
+    globalContext->setObjectName(QStringLiteral("GlobalActionContext"));
 }
 ActionProxy::~ActionProxy()
 {

=== modified file 'src/UbuntuToolkit/adapters/alarmsadapter_organizer.cpp'
--- src/UbuntuToolkit/adapters/alarmsadapter_organizer.cpp	2016-09-09 21:26:23 +0000
+++ src/UbuntuToolkit/adapters/alarmsadapter_organizer.cpp	2016-09-15 14:53:25 +0000
@@ -31,20 +31,19 @@
 #include "alarmmanager_p_p.h"
 #include "ucalarm_p_p.h"
 
-#define ALARM_DATABASE          "%1/alarms.json"
-/*
- * The main alarm manager engine used from Saucy onwards is EDS (Evolution Data
- * Server) based. Any previous release uses the generic "memory" manager engine
- * which does not store alarm data, does not schedule organizer events and does
- * not give visual or audible reminding.
- */
-#define ALARM_MANAGER           "eds"
-#define ALARM_MANAGER_FALLBACK  "memory"
-#define ALARM_COLLECTION        "Alarms"
+static const QString alarmDatabase = QStringLiteral("%1/alarms.json");
+
+// The main alarm manager engine used from Saucy onwards is EDS (Evolution Data
+// Server) based. Any previous release uses the generic "memory" manager engine
+// which does not store alarm data, does not schedule organizer events and does
+// not give visual or audible reminding.
+static const QString alarmManager = QStringLiteral("eds");
+static const QString alarmManagerFallback = QStringLiteral("memory");
+static const QString alarmCollection = QStringLiteral("Alarms");
 
 // special tags used as workaround for bug #1361702
-const char *tagAlarmService = "x-canonical-alarm";
-const char *tagDisabledAlarm = "x-canonical-disabled";
+static const QString tagAlarmService = QStringLiteral("x-canonical-alarm");
+static const QString tagDisabledAlarm = QStringLiteral("x-canonical-disabled");
 
 QTORGANIZER_USE_NAMESPACE
 
@@ -94,7 +93,7 @@
         return false;
     }
     QDateTime dt = AlarmUtils::normalizeDate(date);
-    if (AlarmsAdapter::get()->manager->managerName() == ALARM_MANAGER) {
+    if (AlarmsAdapter::get()->manager->managerName() == alarmManager) {
         // use invalid timezone to simulate floating time for EDS backend
         dt = QDateTime(dt.date(), dt.time(), QTimeZone());
     }
@@ -393,12 +392,13 @@
     // register QOrganizerItemId comparators so QVariant == operator can compare them
     QMetaType::registerComparators<QOrganizerItemId>();
 
-    QString envManager(qgetenv("ALARM_BACKEND"));
+    QString envManager = QString::fromLocal8Bit(qgetenv("ALARM_BACKEND"));
     if (envManager.isEmpty())
-        envManager = ALARM_MANAGER;
+        envManager = alarmManager;
     if (!QOrganizerManager::availableManagers().contains(envManager)) {
-        qWarning() << "WARNING: alarm manager" << envManager << "not installed, using" << QString(ALARM_MANAGER_FALLBACK);
-        envManager = ALARM_MANAGER_FALLBACK;
+        qWarning() << "WARNING: alarm manager" << envManager << "not installed, using"
+                   << alarmManagerFallback;
+        envManager = alarmManagerFallback;
     }
     manager = new QOrganizerManager(envManager);
     manager->setParent(q_ptr);
@@ -406,7 +406,7 @@
     QList<QOrganizerCollection> collections = manager->collections();
     if (collections.count() > 0) {
         Q_FOREACH(const QOrganizerCollection &c, collections) {
-            if (c.metaData(QOrganizerCollection::KeyName).toString() == ALARM_COLLECTION) {
+            if (c.metaData(QOrganizerCollection::KeyName).toString() == alarmCollection) {
                 collection = c;
                 break;
             }
@@ -414,9 +414,10 @@
     }
     if (collection.id().isNull()) {
         // create alarm collection
-        collection.setMetaData(QOrganizerCollection::KeyName, ALARM_COLLECTION);
+        collection.setMetaData(QOrganizerCollection::KeyName, alarmCollection);
         // EDS requires extra metadata to be set
-        collection. setExtendedMetaData("collection-type", "Task List");
+        collection.setExtendedMetaData(
+            QStringLiteral("collection-type"), QStringLiteral("Task List"));
         if (!manager->saveCollection(&collection)) {
             qWarning() << "WARNING: Creating dedicated collection for alarms was not possible, alarms will be saved into the default collection!";
             collection = manager->defaultCollection();
@@ -470,10 +471,10 @@
 // load fallback manager data
 void AlarmsAdapter::loadAlarms()
 {
-    if (manager->managerName() != ALARM_MANAGER_FALLBACK) {
+    if (manager->managerName() != alarmManagerFallback) {
         return;
     }
-    QFile file(QString(ALARM_DATABASE).arg(QStandardPaths::writableLocation(QStandardPaths::DataLocation)));
+    QFile file(alarmDatabase.arg(QStandardPaths::writableLocation(QStandardPaths::DataLocation)));
     if (!file.open(QFile::ReadOnly)) {
         return;
     }
@@ -485,12 +486,13 @@
 
         // use UCAlarm to save store JSON data
         UCAlarm alarm;
-        alarm.setMessage(object["message"].toString());
-        alarm.setDate(QDateTime::fromString(object["date"].toString()));
-        alarm.setSound(object["sound"].toString());
-        alarm.setType(static_cast<UCAlarm::AlarmType>(object["type"].toInt()));
-        alarm.setDaysOfWeek(static_cast<UCAlarm::DaysOfWeek>(object["days"].toInt()));
-        alarm.setEnabled(object["enabled"].toBool());
+        alarm.setMessage(object[QStringLiteral("message")].toString());
+        alarm.setDate(QDateTime::fromString(object[QStringLiteral("date")].toString()));
+        alarm.setSound(object[QStringLiteral("sound")].toString());
+        alarm.setType(static_cast<UCAlarm::AlarmType>(object[QStringLiteral("type")].toInt()));
+        alarm.setDaysOfWeek(
+            static_cast<UCAlarm::DaysOfWeek>(object[QStringLiteral("days")].toInt()));
+        alarm.setEnabled(object[QStringLiteral("enabled")].toBool());
 
         AlarmDataAdapter *pAlarm = static_cast<AlarmDataAdapter*>(UCAlarmPrivate::get(&alarm));
         // call checkAlarm to complete field checks (i.e. type vs daysOfWeek, kick date, etc)
@@ -504,14 +506,14 @@
 // save fallback manager data only
 void AlarmsAdapter::saveAlarms()
 {
-    if (manager->managerName() != ALARM_MANAGER_FALLBACK) {
+    if (manager->managerName() != alarmManagerFallback) {
         return;
     }
     QDir dir(QStandardPaths::writableLocation(QStandardPaths::DataLocation));
     if (!dir.exists()) {
         dir.mkpath(QStandardPaths::writableLocation(QStandardPaths::DataLocation));
     }
-    QFile file(QString(ALARM_DATABASE).arg(dir.path()));
+    QFile file(alarmDatabase.arg(dir.path()));
     if (!file.open(QFile::WriteOnly | QFile::Truncate)) {
         return;
     }
@@ -520,12 +522,12 @@
         // create an UCAlarm and set its event to ease conversions
         const UCAlarm *alarm = alarmList[i];
         QJsonObject object;
-        object["message"] = alarm->message();
-        object["date"] = alarm->date().toString();
-        object["sound"] = alarm->sound().toString();
-        object["type"] = QJsonValue(alarm->type());
-        object["days"] = QJsonValue(alarm->daysOfWeek());
-        object["enabled"] = QJsonValue(alarm->enabled());
+        object[QStringLiteral("message")] = alarm->message();
+        object[QStringLiteral("date")] = alarm->date().toString();
+        object[QStringLiteral("sound")] = alarm->sound().toString();
+        object[QStringLiteral("type")] = QJsonValue(alarm->type());
+        object[QStringLiteral("days")] = QJsonValue(alarm->daysOfWeek());
+        object[QStringLiteral("enabled")] = QJsonValue(alarm->enabled());
         data.append(object);
 
     }
@@ -559,9 +561,11 @@
         {
             Q_ASSERT(value.type() == QVariant::Bool);
             if (value.toBool()) {
-                return !todo.tags().contains(tagDisabledAlarm) && todo.tags().contains(tagAlarmService);
+                return !todo.tags().contains(tagDisabledAlarm)
+                    && todo.tags().contains(tagAlarmService);
             } else {
-                return todo.tags().contains(tagDisabledAlarm) && todo.tags().contains(tagAlarmService);
+                return todo.tags().contains(tagDisabledAlarm)
+                    && todo.tags().contains(tagAlarmService);
             }
         }
         case AlarmManager::Date:

=== modified file 'src/UbuntuToolkit/adapters/dbuspropertywatcher_p.cpp'
--- src/UbuntuToolkit/adapters/dbuspropertywatcher_p.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/adapters/dbuspropertywatcher_p.cpp	2016-09-15 14:53:25 +0000
@@ -24,7 +24,8 @@
 
 #include "i18n_p.h"
 
-#define DYNAMIC_PROPERTY    "__q_property"
+static const char dynamicProperty[] = "__q_property";
+static const QString dbusInterface = QStringLiteral("org.freedesktop.DBus.Properties");
 
 UT_NAMESPACE_BEGIN
 
@@ -35,7 +36,7 @@
 
 DBusServiceProperties::DBusServiceProperties(UCServiceProperties *qq)
     : UCServicePropertiesPrivate(qq)
-    , connection("")
+    , connection(QStringLiteral(""))
     , watcher(0)
     , iface(0)
 {
@@ -53,7 +54,7 @@
 
     if (service.isEmpty() || path.isEmpty()) {
         setStatus(UCServiceProperties::ConnectionError);
-        setError("No service/path specified");
+        setError(QStringLiteral("No service/path specified"));
         return false;
     }
 
@@ -98,14 +99,15 @@
  */
 bool DBusServiceProperties::setupInterface()
 {
-    QDBusReply<QDBusObjectPath> dbusObjectPath = iface->call("FindUserById", qlonglong(getuid()));
+    QDBusReply<QDBusObjectPath> dbusObjectPath =
+        iface->call(QStringLiteral("FindUserById"), qlonglong(getuid()));
     if (dbusObjectPath.isValid()) {
         objectPath = dbusObjectPath.value().path();
         iface->connection().connect(
             service,
             objectPath,
-            "org.freedesktop.DBus.Properties",
-            "PropertiesChanged",
+            dbusInterface,
+            QStringLiteral("PropertiesChanged"),
             this,
             SLOT(updateProperties(QString,QVariantMap,QStringList)));
         return true;
@@ -134,7 +136,7 @@
         return false;
     }
     Q_Q(UCServiceProperties);
-    QDBusInterface readIFace(iface->interface(), objectPath, "org.freedesktop.DBus.Properties", connection);
+    QDBusInterface readIFace(iface->interface(), objectPath, dbusInterface, connection);
     if (!readIFace.isValid()) {
         // report invalid interface only if the property's first letter was with capital one!
         if (property[0].isUpper()) {
@@ -142,7 +144,7 @@
         }
         return false;
     }
-    QDBusPendingCall pending = readIFace.asyncCall("Get", adaptor, property);
+    QDBusPendingCall pending = readIFace.asyncCall(QStringLiteral("Get"), adaptor, property);
     if (pending.isError()) {
         warning(pending.error().message());
         return false;
@@ -152,7 +154,7 @@
                      this, SLOT(readFinished(QDBusPendingCallWatcher*)));
 
     // set a dynamic property so we know which property are we reading
-    callWatcher->setProperty(DYNAMIC_PROPERTY, property);
+    callWatcher->setProperty(dynamicProperty, property);
     return true;
 }
 
@@ -164,12 +166,13 @@
     if (objectPath.isEmpty()) {
         return false;
     }
-    QDBusInterface writeIFace(iface->interface(), objectPath, "org.freedesktop.DBus.Properties", connection);
+    QDBusInterface writeIFace(iface->interface(), objectPath, dbusInterface, connection);
     if (!writeIFace.isValid()) {
         // invalid interface
         return false;
     }
-    QDBusMessage msg = writeIFace.call("Set", adaptor, property, QVariant::fromValue(QDBusVariant(value)));
+    QDBusMessage msg = writeIFace.call(
+        QStringLiteral("Set"), adaptor, property, QVariant::fromValue(QDBusVariant(value)));
     return msg.type() == QDBusMessage::ReplyMessage;
 }
 
@@ -180,7 +183,7 @@
 {
     Q_Q(UCServiceProperties);
     QDBusPendingReply<QVariant> reply = *call;
-    QString property = call->property(DYNAMIC_PROPERTY).toString();
+    QString property = call->property(dynamicProperty).toString();
     scannedProperties.removeAll(property);
     if (reply.isError()) {
         // remove the property from being watched, as it has no property like that

=== modified file 'src/UbuntuToolkit/i18n.cpp'
--- src/UbuntuToolkit/i18n.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/i18n.cpp	2016-09-15 14:53:25 +0000
@@ -68,7 +68,7 @@
      * Note: $LANGUAGE is implicitly respected by gettext() calls and
      *   defines the order of multiple locales
      */
-    m_language = setlocale(LC_ALL, "");
+    m_language = QString::fromLocal8Bit(setlocale(LC_ALL, ""));
 }
 
 UbuntuI18n::~UbuntuI18n()
@@ -119,11 +119,11 @@
      For click we use APP_DIR/share/locale
      e.g. /usr/share/click/preinstalled/com.example.foo/current/share/locale
      */
-    QString appDir(getenv("APP_DIR"));
+    QString appDir = QString::fromLocal8Bit(getenv("APP_DIR"));
     if (!QDir::isAbsolutePath (appDir)) {
-        appDir = "/usr";
+        appDir = QStringLiteral("/usr");
     }
-    QString localePath(QDir(appDir).filePath("share/locale"));
+    QString localePath(QDir(appDir).filePath(QStringLiteral("share/locale")));
     C::bindtextdomain(domain.toUtf8(), localePath.toUtf8());
     Q_EMIT domainChanged();
 }
@@ -275,70 +275,89 @@
  */
 QString UbuntuI18n::relativeDateTime(const QDateTime& datetime)
 {
+    static const QString ubuntuUiToolkit = QStringLiteral("ubuntu-ui-toolkit");
+
     QDateTime relativeTo(QDateTime::currentDateTime());
     const date_proximity_t prox = getDateProximity(relativeTo, datetime);
 
     switch (prox)  {
         case DATE_PROXIMITY_NOW:
             /* TRANSLATORS: Time based "this is happening/happened now" */
-            return dtr("ubuntu-ui-toolkit", "Now");
+            return dtr(ubuntuUiToolkit, QStringLiteral("Now"));
 
         case DATE_PROXIMITY_HOUR:
         {
             qint64 diff = datetime.toMSecsSinceEpoch() - relativeTo.toMSecsSinceEpoch();
             qint64 minutes = qRound(float(diff) / 60000);
             if (minutes < 0) {
-                return dtr("ubuntu-ui-toolkit", "%1 minute ago", "%1 minutes ago", qAbs(minutes)).arg(qAbs(minutes));
+                return dtr(ubuntuUiToolkit, QStringLiteral("%1 minute ago"),
+                           QStringLiteral("%1 minutes ago"), qAbs(minutes)).arg(qAbs(minutes));
             }
-            return dtr("ubuntu-ui-toolkit", "%1 minute", "%1 minutes", minutes).arg(minutes);
+            return dtr(ubuntuUiToolkit, QStringLiteral("%1 minute"),
+                       QStringLiteral("%1 minutes"), minutes).arg(minutes);
         }
 
         case DATE_PROXIMITY_TODAY:
             /* en_US example: "1:00 PM" */
-            /* TRANSLATORS: Please translated these to your locale datetime format using the format specified by
-               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
-            return datetime.toString(isLocale12h() ? dtr("ubuntu-ui-toolkit", "h:mm ap"):
-            /* TRANSLATORS: Please translated these to your locale datetime format using the format specified by
-               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
-                                                     dtr("ubuntu-ui-toolkit", "HH:mm"));
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+            return datetime.toString(isLocale12h()
+                ? dtr(ubuntuUiToolkit, QStringLiteral("h:mm ap"))
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+                : dtr(ubuntuUiToolkit, QStringLiteral("HH:mm")));
 
         case DATE_PROXIMITY_YESTERDAY:
             /* en_US example: "Yesterday  13:00" */
-            /* TRANSLATORS: Please translated these to your locale datetime format using the format specified by
-               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
-            return datetime.toString(isLocale12h() ? dtr("ubuntu-ui-toolkit", "'Yesterday\u2003'h:mm ap") :
-            /* TRANSLATORS: Please translated these to your locale datetime format using the format specified by
-               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
-                                                     dtr("ubuntu-ui-toolkit", "'Yesterday\u2003'HH:mm"));
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+            return datetime.toString(isLocale12h()
+                ? dtr(ubuntuUiToolkit, QStringLiteral("'Yesterday\u2003'h:mm ap"))
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+                : dtr(ubuntuUiToolkit, QStringLiteral("'Yesterday\u2003'HH:mm")));
 
         case DATE_PROXIMITY_TOMORROW:
             /* en_US example: "Tomorrow  1:00 PM" */
-            /* TRANSLATORS: Please translated these to your locale datetime format using the format specified by
-               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
-            return datetime.toString(isLocale12h() ? dtr("ubuntu-ui-toolkit", "'Tomorrow\u2003'h:mm ap") :
-            /* TRANSLATORS: Please translated these to your locale datetime format using the format specified by
-               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
-                                                     dtr("ubuntu-ui-toolkit", "'Tomorrow\u2003'HH:mm"));
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+            return datetime.toString(isLocale12h()
+                ? dtr(ubuntuUiToolkit, QStringLiteral("'Tomorrow\u2003'h:mm ap"))
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+                : dtr(ubuntuUiToolkit, QStringLiteral("'Tomorrow\u2003'HH:mm")));
 
         case DATE_PROXIMITY_LAST_WEEK:
         case DATE_PROXIMITY_NEXT_WEEK:
             /* en_US example: "Fri  1:00 PM" */
-            /* TRANSLATORS: Please translated these to your locale datetime format using the format specified by
-               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
-            return datetime.toString(isLocale12h() ? dtr("ubuntu-ui-toolkit", "ddd'\u2003'h:mm ap") :
-            /* TRANSLATORS: Please translated these to your locale datetime format using the format specified by
-               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
-                                                     dtr("ubuntu-ui-toolkit", "ddd'\u2003'HH:mm"));
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+            return datetime.toString(isLocale12h()
+                ? dtr(ubuntuUiToolkit, QStringLiteral("ddd'\u2003'h:mm ap"))
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+                : dtr(ubuntuUiToolkit, QStringLiteral("ddd'\u2003'HH:mm")));
 
         case DATE_PROXIMITY_FAR_BACK:
         case DATE_PROXIMITY_FAR_FORWARD:
         default:
-            /* TRANSLATORS: Please translated these to your locale datetime format using the format specified by
-               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
-            return datetime.toString(isLocale12h() ? dtr("ubuntu-ui-toolkit", "ddd d MMM'\u2003'h:mm ap") :
-            /* TRANSLATORS: Please translated these to your locale datetime format using the format specified by
-               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
-                                                     dtr("ubuntu-ui-toolkit", "ddd d MMM'\u2003'HH:mm"));
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+            return datetime.toString(isLocale12h()
+                ? dtr(ubuntuUiToolkit, QStringLiteral("ddd d MMM'\u2003'h:mm ap"))
+            /* TRANSLATORS: Please translate these to your locale datetime
+               format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+                : dtr(ubuntuUiToolkit, QStringLiteral("ddd d MMM'\u2003'HH:mm")));
     }
     return datetime.toString(Qt::DefaultLocaleShortDate);
 }

=== modified file 'src/UbuntuToolkit/livetimer_p.cpp'
--- src/UbuntuToolkit/livetimer_p.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/livetimer_p.cpp	2016-09-15 14:53:25 +0000
@@ -20,6 +20,8 @@
 
 #include "timeutils_p.h"
 
+static const QString dbusService = QStringLiteral("org.freedesktop.timedate1");
+
 UT_NAMESPACE_BEGIN
 
 SharedLiveTimer::SharedLiveTimer(QObject* parent)
@@ -29,12 +31,10 @@
     m_timer.setSingleShot(true);
     connect(&m_timer, &QTimer::timeout, this, &SharedLiveTimer::timeout);
 
-    QDBusConnection::systemBus().connect("org.freedesktop.timedate1",
-                                         "/org/freedesktop/timedate1",
-                                         "org.freedesktop.DBus.Properties",
-                                         "PropertiesChanged",
-                                         this,
-                                         SLOT(timedate1PropertiesChanged(QString, QVariantMap, QStringList)));
+    QDBusConnection::systemBus().connect(
+        dbusService, QStringLiteral("/org/freedesktop/timedate1"),
+        QStringLiteral("org.freedesktop.DBus.Properties"), QStringLiteral("PropertiesChanged"),
+        this, SLOT(timedate1PropertiesChanged(QString, QVariantMap, QStringList)));
 }
 
 void SharedLiveTimer::registerTimer(LiveTimer *timer)
@@ -161,8 +161,8 @@
 
 void SharedLiveTimer::timedate1PropertiesChanged(const QString &interface, const QVariantMap &changed, const QStringList &)
 {
-    if (interface != "org.freedesktop.timedate1") return;
-    if (!changed.contains("Timezone")) return;
+    if (interface != dbusService) return;
+    if (!changed.contains(QStringLiteral("Timezone"))) return;
 
     QList<LiveTimer*> tmpTimers(m_liveTimers);
     Q_FOREACH(LiveTimer* timer, tmpTimers) {

=== modified file 'src/UbuntuToolkit/privates/appheaderbase.cpp'
--- src/UbuntuToolkit/privates/appheaderbase.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/privates/appheaderbase.cpp	2016-09-15 14:53:25 +0000
@@ -36,7 +36,7 @@
     , m_animate(true)
 {
     connect(this, &UCHeader::themeChanged, this, &UCAppHeaderBase::themeChanged2);
-    UCStyledItemBasePrivate::get(this)->styleDocument = "PageHeadStyle";
+    UCStyledItemBasePrivate::get(this)->styleDocument = QStringLiteral("PageHeadStyle");
 }
 
 UCTheme* UCAppHeaderBase::theme2()

=== modified file 'src/UbuntuToolkit/privates/listitemdragarea.cpp'
--- src/UbuntuToolkit/privates/listitemdragarea.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/privates/listitemdragarea.cpp	2016-09-15 14:53:25 +0000
@@ -48,7 +48,7 @@
     setAcceptedMouseButtons(Qt::LeftButton);
 
     // for testing purposes
-    setObjectName("drag_area");
+    setObjectName(QStringLiteral("drag_area"));
 }
 
 void ListItemDragArea::init(UCViewItemsAttached *viewItems)

=== modified file 'src/UbuntuToolkit/privates/listitemdraghandler.cpp'
--- src/UbuntuToolkit/privates/listitemdraghandler.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/privates/listitemdraghandler.cpp	2016-09-15 14:53:25 +0000
@@ -61,7 +61,7 @@
         connect(animation, &QQuickAbstractAnimation::stopped,
                 this, &ListItemDragHandler::dropItem, Qt::DirectConnection);
         // force properties to contain only the 'y' coordinate
-        animation->setProperties("y");
+        animation->setProperties(QStringLiteral("y"));
         animation->setTargetObject(listItem);
         animation->setFrom(listItem->y());
         animation->setTo(targetPos.y());

=== modified file 'src/UbuntuToolkit/privates/splitviewhandler.cpp'
--- src/UbuntuToolkit/privates/splitviewhandler.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/privates/splitviewhandler.cpp	2016-09-15 14:53:25 +0000
@@ -32,7 +32,7 @@
     : QQuickMouseArea(parent)
 {
     // for testing purposes
-    setObjectName("resize_handle");
+    setObjectName(QStringLiteral("resize_handle"));
     setFlag(ItemHasContents);
     setHoverEnabled(true);
     setAcceptedButtons(Qt::LeftButton);
@@ -115,7 +115,7 @@
     // and set the new delegate - if any
     if (SplitViewPrivate::get(view)->handleDelegate) {
         QQmlContext *context = new QQmlContext(qmlContext(this), this);
-        context->setContextProperty("handle", QVariant::fromValue(this));
+        context->setContextProperty(QStringLiteral("handle"), QVariant::fromValue(this));
         QObject *object = SplitViewPrivate::get(view)->handleDelegate->beginCreate(context);
         if (object) {
             QQuickItem *item = qobject_cast<QQuickItem*>(object);

=== modified file 'src/UbuntuToolkit/qquickmimedata.cpp'
--- src/UbuntuToolkit/qquickmimedata.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/qquickmimedata.cpp	2016-09-15 14:53:25 +0000
@@ -198,11 +198,14 @@
     QMimeDatabase db;
     for (int i = 0; i < mlist.length() / 2; i++) {
         QString type = mlist[2 * i].toString();
-        if (db.mimeTypeForName(type).isValid() || type == "application/x-color") {
+        // FIXME(loicm) Just went through that while converting the code base to
+        //     QStringLiteral, the else can't be executed here and that smells
+        //     like a bug.
+        if (db.mimeTypeForName(type).isValid() || type == QStringLiteral("application/x-color")) {
             QByteArray data = mlist[2 * i + 1].toByteArray();
             mimeData->setData(type, data);
             ret = true;
-        } else if (type == "application/x-color") {
+        } else if (type == QStringLiteral("application/x-color")) {
             // for some reason colors are not taken in other way...
             mimeData->setColorData(mlist[2 * i + 1]);
             ret = true;

=== modified file 'src/UbuntuToolkit/quickutils.cpp'
--- src/UbuntuToolkit/quickutils.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/quickutils.cpp	2016-09-15 14:53:25 +0000
@@ -40,7 +40,7 @@
     m_keyboardAttached(false)
 {
     QGuiApplication::instance()->installEventFilter(this);
-    m_omitIM << "ibus" << "none" << "compose";
+    m_omitIM << QStringLiteral("ibus") << QStringLiteral("none") << QStringLiteral("compose");
 }
 
 /*!
@@ -113,7 +113,7 @@
 
 QString QuickUtils::inputMethodProvider() const
 {
-    QString im(getenv("QT_IM_MODULE"));
+    QString im = QString::fromLocal8Bit(getenv("QT_IM_MODULE"));
 
     return m_omitIM.contains(im) ? QString() : im;
 }
@@ -137,10 +137,10 @@
 QString QuickUtils::className(QObject *item)
 {
     if (!item) {
-        return QString("(null)");
+        return QStringLiteral("(null)");
     }
-    QString result = item->metaObject()->className();
-    return result.left(result.indexOf("_QML"));
+    QString result = QString::fromLatin1(item->metaObject()->className());
+    return result.left(result.indexOf(QStringLiteral("_QML")));
 }
 
 /*!
@@ -155,8 +155,8 @@
     const QMetaObject *mo = object->metaObject();
     QString className;
     while (mo) {
-        className = mo->className();
-        className = className.left(className.indexOf("_QML"));
+        className = QString::fromLatin1(mo->className());
+        className = className.left(className.indexOf(QStringLiteral("_QML")));
         if (className == fromClass) {
             return true;
         }

=== modified file 'src/UbuntuToolkit/sortfiltermodel.cpp'
--- src/UbuntuToolkit/sortfiltermodel.cpp	2016-08-16 08:43:28 +0000
+++ src/UbuntuToolkit/sortfiltermodel.cpp	2016-09-15 14:53:25 +0000
@@ -113,11 +113,12 @@
 int
 QSortFilterProxyModelQML::roleByName(const QString& roleName) const
 {
+    const QByteArray roleNameByteArray = roleName.toUtf8();
     const QHash<int, QByteArray> roles = roleNames();
     QHashIterator<int, QByteArray> i(roles);
     while (i.hasNext()) {
         i.next();
-        if (i.value() == roleName)
+        if (i.value() == roleNameByteArray)
             return i.key();
     }
     return 0;
@@ -224,7 +225,7 @@
     QHashIterator<int, QByteArray> i(roles);
     while (i.hasNext()) {
         i.next();
-        res.insert(i.value(), index(row, 0).data(i.key()));
+        res.insert(QString::fromUtf8(i.value()), index(row, 0).data(i.key()));
     }
     return res;
 }

=== modified file 'src/UbuntuToolkit/statesaverbackend_p.cpp'
--- src/UbuntuToolkit/statesaverbackend_p.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/statesaverbackend_p.cpp	2016-09-15 14:53:25 +0000
@@ -91,13 +91,13 @@
     // see bug https://bugreports.qt-project.org/browse/QTBUG-41735
     QString runtimeDir = QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation);
     if (runtimeDir.isEmpty()) {
-        runtimeDir = qgetenv("XDG_RUNTIME_DIR");
+        runtimeDir = QString::fromLocal8Bit(qgetenv("XDG_RUNTIME_DIR"));
     }
     if (runtimeDir.isEmpty()) {
         qCritical() << "[StateSaver] No XDG_RUNTIME_DIR path set, cannot create appstate file.";
         return;
     }
-    m_archive = new QSettings(QString("%1/%2/statesaver.appstate").
+    m_archive = new QSettings(QStringLiteral("%1/%2/statesaver.appstate").
                               arg(runtimeDir).
                               arg(applicationName), QSettings::NativeFormat);
     m_archive->setFallbacksEnabled(false);
@@ -171,7 +171,8 @@
             // skip the property
             continue;
         }
-        QQmlProperty qmlProperty(item, propertyName.toLocal8Bit().constData(), qmlContext(item));
+        QQmlProperty qmlProperty(
+            item, QString::fromLatin1(propertyName.toLocal8Bit().constData()), qmlContext(item));
         if (qmlProperty.isValid() && qmlProperty.isWritable()) {
             QVariant type = m_archive.data()->value(propertyName + "_TYPE");
             value.convert(type.toInt());
@@ -183,9 +184,9 @@
                     "object %2 has type %3 and cannot be set to value \"%4\" of"
                     " type %5").arg(propertyName)
                                .arg(qmlContext(item)->nameForObject(item))
-                               .arg(qmlProperty.propertyTypeName())
+                               .arg(QString::fromLatin1(qmlProperty.propertyTypeName()))
                                .arg(value.toString())
-                               .arg(value.typeName());
+                               .arg(QString::fromLatin1(value.typeName()));
             }
         } else {
             qmlInfo(item) << QStringLiteral("property \"%1\" does not exist or is not writable for object %2")
@@ -193,7 +194,7 @@
         }
     }
     // drop cache once properties are successfully restored
-    m_archive.data()->remove("");
+    m_archive.data()->remove(QStringLiteral(""));
     m_archive.data()->endGroup();
     // restore leaved group if needed
     if (restorePreviousGroup) {
@@ -210,7 +211,8 @@
     m_archive.data()->beginGroup(id);
     int result = 0;
     Q_FOREACH(const QString &propertyName, properties) {
-        QQmlProperty qmlProperty(item, propertyName.toLocal8Bit().constData());
+        QQmlProperty qmlProperty(
+            item, QString::fromLatin1(propertyName.toLocal8Bit().constData()));
         if (qmlProperty.isValid()) {
             QVariant value = qmlProperty.read();
             if (static_cast<QMetaType::Type>(value.type()) != QMetaType::QObjectStar) {

=== modified file 'src/UbuntuToolkit/timeutils_p.h'
--- src/UbuntuToolkit/timeutils_p.h	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/timeutils_p.h	2016-09-15 14:53:25 +0000
@@ -31,8 +31,8 @@
 inline bool isLocale12h(void)
 {
    QString strTimeFormat = QLocale::system().timeFormat();
-   QStringList includes; includes << "AP"; includes << "ap";
-   QStringList excludes; excludes << "H"; excludes << "HH";
+   QStringList includes; includes << QStringLiteral("AP"); includes << QStringLiteral("ap");
+   QStringList excludes; excludes << QStringLiteral("H"); excludes << QStringLiteral("HH");
 
    Q_FOREACH(const QString& exclude, excludes) {
        if (strTimeFormat.contains(exclude)) {

=== modified file 'src/UbuntuToolkit/ubuntutoolkitmodule.cpp'
--- src/UbuntuToolkit/ubuntutoolkitmodule.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/ubuntutoolkitmodule.cpp	2016-09-15 14:53:25 +0000
@@ -102,7 +102,8 @@
 
 UT_NAMESPACE_BEGIN
 
-const char *EngineProperty("__ubuntu_toolkit_plugin_data");
+static const QString notInstantiatable = QStringLiteral("Not instantiatable");
+static const char engineProperty[] = "__ubuntu_toolkit_plugin_data";
 
 /******************************************************************************
  * UbuntuToolkitModule
@@ -114,7 +115,7 @@
     }
     UbuntuToolkitModule *data = new UbuntuToolkitModule(engine);
     data->m_baseUrl = QUrl(baseUrl.toString() + '/');
-    engine->setProperty(EngineProperty, QVariant::fromValue(data));
+    engine->setProperty(engineProperty, QVariant::fromValue(data));
     return data;
 }
 
@@ -139,7 +140,7 @@
     QQuickView* view = qobject_cast<QQuickView*>(focusWindow);
 
     if (view != NULL) {
-        view->rootContext()->setContextProperty("window", view);
+        view->rootContext()->setContextProperty(QStringLiteral("window"), view);
     }
 }
 
@@ -156,37 +157,37 @@
 
     // register root object watcher that sets a global property with the root object
     // that can be accessed from any object
-    context->setContextProperty("QuickUtils", QuickUtils::instance());
+    context->setContextProperty(QStringLiteral("QuickUtils"), QuickUtils::instance());
 
     UCDeprecatedTheme::registerToContext(context);
 
-    context->setContextProperty("i18n", UbuntuI18n::instance());
+    context->setContextProperty(QStringLiteral("i18n"), UbuntuI18n::instance());
     ContextPropertyChangeListener *i18nChangeListener =
-        new ContextPropertyChangeListener(context, "i18n");
+        new ContextPropertyChangeListener(context, QStringLiteral("i18n"));
     QObject::connect(UbuntuI18n::instance(), SIGNAL(domainChanged()),
                      i18nChangeListener, SLOT(updateContextProperty()));
     QObject::connect(UbuntuI18n::instance(), SIGNAL(languageChanged()),
                      i18nChangeListener, SLOT(updateContextProperty()));
 
     // We can't use 'Application' because it exists (undocumented)
-    context->setContextProperty("UbuntuApplication", UCApplication::instance());
+    context->setContextProperty(QStringLiteral("UbuntuApplication"), UCApplication::instance());
     ContextPropertyChangeListener *applicationChangeListener =
-        new ContextPropertyChangeListener(context, "UbuntuApplication");
+        new ContextPropertyChangeListener(context, QStringLiteral("UbuntuApplication"));
     QObject::connect(UCApplication::instance(), SIGNAL(applicationNameChanged()),
                      applicationChangeListener, SLOT(updateContextProperty()));
     // Give the application object access to the engine
     UCApplication::instance()->setContext(context);
 
-    context->setContextProperty("units", UCUnits::instance());
+    context->setContextProperty(QStringLiteral("units"), UCUnits::instance());
     ContextPropertyChangeListener *unitsChangeListener =
-        new ContextPropertyChangeListener(context, "units");
+        new ContextPropertyChangeListener(context, QStringLiteral("units"));
     QObject::connect(UCUnits::instance(), SIGNAL(gridUnitChanged()),
                      unitsChangeListener, SLOT(updateContextProperty()));
 
     // register FontUtils
-    context->setContextProperty("FontUtils", UCFontUtils::instance());
+    context->setContextProperty(QStringLiteral("FontUtils"), UCFontUtils::instance());
     ContextPropertyChangeListener *fontUtilsListener =
-        new ContextPropertyChangeListener(context, "FontUtils");
+        new ContextPropertyChangeListener(context, QStringLiteral("FontUtils"));
     QObject::connect(UCUnits::instance(), SIGNAL(gridUnitChanged()),
                      fontUtilsListener, SLOT(updateContextProperty()));
 }
@@ -195,13 +196,16 @@
 {
     qmlRegisterType<UCAction>(uri, major, minor, "Action");
     qmlRegisterType<UCActionContext>(uri, major, minor, "ActionContext");
-    qmlRegisterUncreatableType<UCApplication>(uri, major, minor, "UCApplication", "Not instantiable");
+    qmlRegisterUncreatableType<UCApplication>(
+        uri, major, minor, "UCApplication", notInstantiatable);
     qmlRegisterType<UCActionManager>(uri, major, minor, "ActionManager");
-    qmlRegisterUncreatableType<UCFontUtils>(uri, major, minor, "UCFontUtils", "Not instantiable");
+    qmlRegisterUncreatableType<UCFontUtils>(uri, major, minor, "UCFontUtils", notInstantiatable);
     qmlRegisterType<UCStyledItemBase>(uri, major, minor, "StyledItem");
-    qmlRegisterUncreatableType<UbuntuI18n>(uri, major, minor, "i18n", "Singleton object");
-    qmlRegisterExtendedType<QQuickImageBase, UCQQuickImageExtension>(uri, major, minor, "QQuickImageBase");
-    qmlRegisterUncreatableType<UCUnits>(uri, major, minor, "UCUnits", "Not instantiable");
+    qmlRegisterUncreatableType<UbuntuI18n>(
+        uri, major, minor, "i18n", QStringLiteral("Singleton object"));
+    qmlRegisterExtendedType<
+        QQuickImageBase, UCQQuickImageExtension>(uri, major, minor, "QQuickImageBase");
+    qmlRegisterUncreatableType<UCUnits>(uri, major, minor, "UCUnits", notInstantiatable);
     qmlRegisterType<UCUbuntuShape>(uri, major, minor, "UbuntuShape");
     // FIXME/DEPRECATED: Shape is exported for backwards compatibility only
     qmlRegisterType<UCUbuntuShape>(uri, major, minor, "Shape");
@@ -238,7 +242,7 @@
     if (!engine) {
         return QUrl();
     }
-    UbuntuToolkitModule *data = engine->property(EngineProperty).value<UbuntuToolkitModule*>();
+    UbuntuToolkitModule *data = engine->property(engineProperty).value<UbuntuToolkitModule*>();
     return !data ? QUrl() : data->m_baseUrl;
 }
 
@@ -277,23 +281,24 @@
 
     // Application monitoring.
     UMApplicationMonitor* applicationMonitor = UMApplicationMonitor::instance();
-    const QByteArray metricsLoggingFilter = qgetenv("UC_METRICS_LOGGING_FILTER");
+    const QString metricsLoggingFilter =
+        QString::fromLocal8Bit(qgetenv("UC_METRICS_LOGGING_FILTER"));
     if (!metricsLoggingFilter.isNull()) {
-        QStringList filterList = QString(metricsLoggingFilter).split(
-            QChar(','), QString::SkipEmptyParts);
+        QStringList filterList =
+            metricsLoggingFilter.split(QStringLiteral(","), QString::SkipEmptyParts);
         UMApplicationMonitor::LoggingFilters filter = 0;
         const int size = filterList.size();
         for (int i = 0; i < size; ++i) {
-            if (filterList[i] == "*") {
+            if (filterList[i] == QStringLiteral("*")) {
                 filter |= UMApplicationMonitor::AllEvents;
                 break;
-            } else if (filterList[i] == "window") {
+            } else if (filterList[i] == QStringLiteral("window")) {
                 filter |= UMApplicationMonitor::WindowEvent;
-            } else if (filterList[i] == "process") {
+            } else if (filterList[i] == QStringLiteral("process")) {
                 filter |= UMApplicationMonitor::ProcessEvent;
-            } else if (filterList[i] == "frame") {
+            } else if (filterList[i] == QStringLiteral("frame")) {
                 filter |= UMApplicationMonitor::FrameEvent;
-            } else if (filterList[i] == "generic") {
+            } else if (filterList[i] == QStringLiteral("generic")) {
                 filter |= UMApplicationMonitor::GenericEvent;
             }
         }
@@ -307,7 +312,7 @@
         } else if (metricsLogging == "lttng") {
             logger = new UMLTTNGLogger();
         } else {
-            logger = new UMFileLogger(metricsLogging);
+            logger = new UMFileLogger(QString::fromLocal8Bit(metricsLogging));
         }
         if (logger->isOpen()) {
             applicationMonitor->installLogger(logger);
@@ -321,7 +326,8 @@
     }
 
     // register performance monitor
-    engine->rootContext()->setContextProperty("performanceMonitor", new UCPerformanceMonitor(engine));
+    engine->rootContext()->setContextProperty(
+        QStringLiteral("performanceMonitor"), new UCPerformanceMonitor(engine));
 }
 
 void UbuntuToolkitModule::defineModule()
@@ -335,22 +341,25 @@
     ForwardedEvent::registerForwardedEvent();
 
     // register parent type so that properties can get/ set it
-    qmlRegisterUncreatableType<QAbstractItemModel>(uri, 1, 1, "QAbstractItemModel", "Not instantiable");
+    qmlRegisterUncreatableType<QAbstractItemModel>(
+        uri, 1, 1, "QAbstractItemModel", notInstantiatable);
 
     // register 1.1 only API
     qmlRegisterType<UCStyledItemBase, 1>(uri, 1, 1, "StyledItem");
     qmlRegisterType<QSortFilterProxyModelQML>(uri, 1, 1, "SortFilterModel");
-    qmlRegisterUncreatableType<FilterBehavior>(uri, 1, 1, "FilterBehavior", "Not instantiable");
-    qmlRegisterUncreatableType<SortBehavior>(uri, 1, 1, "SortBehavior", "Not instantiable");
+    qmlRegisterUncreatableType<FilterBehavior>(uri, 1, 1, "FilterBehavior", notInstantiatable);
+    qmlRegisterUncreatableType<SortBehavior>(uri, 1, 1, "SortBehavior", notInstantiatable);
     qmlRegisterType<UCServiceProperties, 1>(uri, 1, 1, "ServiceProperties");
 
     // register 1.2 only API
     qmlRegisterType<UCListItem>(uri, 1, 2, "ListItem");
     qmlRegisterType<UCListItemDivider>();
-    qmlRegisterUncreatableType<UCSwipeEvent>(uri, 1, 2, "SwipeEvent", "This is an event object.");
-    qmlRegisterUncreatableType<UCDragEvent>(uri, 1, 2, "ListItemDrag", "This is an event object");
+    qmlRegisterUncreatableType<UCSwipeEvent>(
+        uri, 1, 2, "SwipeEvent", QStringLiteral("This is an event object."));
+    qmlRegisterUncreatableType<UCDragEvent>(
+        uri, 1, 2, "ListItemDrag", QStringLiteral("This is an event object"));
     qmlRegisterType<UCListItemActions>(uri, 1, 2, "ListItemActions");
-    qmlRegisterUncreatableType<UCViewItemsAttached>(uri, 1, 2, "ViewItems", "Not instantiable");
+    qmlRegisterUncreatableType<UCViewItemsAttached>(uri, 1, 2, "ViewItems", notInstantiatable);
     qmlRegisterType<UCUbuntuShape, 1>(uri, 1, 2, "UbuntuShape");
     qmlRegisterType<UCUbuntuShapeOverlay>(uri, 1, 2, "UbuntuShapeOverlay");
 
@@ -368,8 +377,9 @@
     qmlRegisterType<LiveTimer>(uri, 1, 3, "LiveTimer");
     qmlRegisterType<UCAbstractButton>(uri, 1, 3, "AbstractButton");
     qmlRegisterType<UCMargins>();
-    qmlRegisterUncreatableType<UCSlotsAttached>(uri, 1, 3, "SlotsAttached", "Not instantiable");
-    qmlRegisterUncreatableType<UCSlotsLayoutPadding>(uri, 1, 3, "SlotsLayoutPadding", "Not instantiable");
+    qmlRegisterUncreatableType<UCSlotsAttached>(uri, 1, 3, "SlotsAttached", notInstantiatable);
+    qmlRegisterUncreatableType<UCSlotsLayoutPadding>(
+        uri, 1, 3, "SlotsLayoutPadding", notInstantiatable);
     qmlRegisterType<UCListItemLayout>(uri, 1, 3, "ListItemLayout");
     qmlRegisterType<UCHeader>(uri, 1, 3, "Header");
     qmlRegisterType<UCLabel>(uri, 1, 3, "Label");

=== modified file 'src/UbuntuToolkit/ucaction.cpp'
--- src/UbuntuToolkit/ucaction.cpp	2016-09-09 18:16:57 +0000
+++ src/UbuntuToolkit/ucaction.cpp	2016-09-15 14:53:25 +0000
@@ -201,9 +201,9 @@
     // if we have a mnemonic, underscore it
     if (!m_mnemonic.isEmpty()) {
 
-        QString mnemonic = "&" + m_mnemonic.toString().remove("Alt+");
+        QString mnemonic = "&" + m_mnemonic.toString().remove(QStringLiteral("Alt+"));
         // patch special cases
-        mnemonic.replace("Space", " ");
+        mnemonic.replace(QStringLiteral("Space"), QStringLiteral(" "));
         int mnemonicIndex = m_text.indexOf(mnemonic);
         if (mnemonicIndex < 0) {
             // try lower case
@@ -311,7 +311,7 @@
 void UCAction::generateName()
 {
     static int id = 0;
-    m_name = QString("unity-action-%1").arg(id++);
+    m_name = QStringLiteral("unity-action-%1").arg(id++);
 }
 
 /*!

=== modified file 'src/UbuntuToolkit/ucactionitem.cpp'
--- src/UbuntuToolkit/ucactionitem.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/ucactionitem.cpp	2016-09-15 14:53:25 +0000
@@ -281,7 +281,8 @@
     if (d->action) {
         return d->action->m_iconSource;
     }
-    return !iconName().isEmpty() ? QUrl(QString("image://theme/%1").arg(iconName())) : QUrl();
+    return !iconName().isEmpty() ?
+        QUrl(QStringLiteral("image://theme/%1").arg(iconName())) : QUrl();
 }
 void UCActionItem::setIconSource(const QUrl &iconSource)
 {

=== modified file 'src/UbuntuToolkit/ucargument.cpp'
--- src/UbuntuToolkit/ucargument.cpp	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/ucargument.cpp	2016-09-15 14:53:25 +0000
@@ -136,7 +136,7 @@
 
     if (!m_name.isEmpty()) {
         // for named argument: --name=value1 value2
-        syntax.append("--");
+        syntax.append(QStringLiteral("--"));
         syntax.append(m_name);
 
         if (!m_valueNames.empty()) {

=== modified file 'src/UbuntuToolkit/ucarguments.cpp'
--- src/UbuntuToolkit/ucarguments.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/ucarguments.cpp	2016-09-15 14:53:25 +0000
@@ -405,9 +405,10 @@
 
     // pass the values to the defaultArgument
     if (m_defaultArgument != NULL) {
-        if (argumentsValues.contains("")) {
+        if (argumentsValues.contains(QStringLiteral(""))) {
             int numberArguments = m_defaultArgument->valueNames().size();
-            m_defaultArgument->setValues(argumentsValues.value("").mid(0, numberArguments));
+            m_defaultArgument->setValues(
+                argumentsValues.value(QStringLiteral("")).mid(0, numberArguments));
             if (numberArguments > 0) {
                 // FIXME: not very elegant way to inform that values have changed
                 Q_EMIT(defaultArgumentChanged());
@@ -447,7 +448,7 @@
             // remove all prepended '-'
             rawArgument = rawArgument.split('-', QString::SkipEmptyParts).join('-');
             // string after the '=' sign is a value for the argument
-            values = rawArgument.split("=");
+            values = rawArgument.split(QStringLiteral("="));
             name = values.takeAt(0);
 
             if (expectedArguments.contains(name)) {
@@ -456,7 +457,7 @@
             argumentsValues.insert(name, values);
         } else {
             // default/unnamed argument
-            argumentsValues[""].append(rawArgument);
+            argumentsValues[QStringLiteral("")].append(rawArgument);
         }
     }
 
@@ -486,9 +487,9 @@
 }
 
 bool UCArguments::usageRequested(const QStringList& argumentNames) {
-    return argumentNames.contains("help") ||
-           argumentNames.contains("h") ||
-           argumentNames.contains("usage");
+    return argumentNames.contains(QStringLiteral("help")) ||
+        argumentNames.contains(QStringLiteral("h")) ||
+        argumentNames.contains(QStringLiteral("usage"));
 }
 
 bool UCArguments::requiredArgumentsProvided(const QHash<QString, QStringList>& argumentsValues, QString& error)
@@ -517,8 +518,8 @@
 {
     // check if the required default argument was passed
     if (m_defaultArgument != NULL && m_defaultArgument->required() &&
-         ((!argumentsValues.contains("") && m_defaultArgument->valueNames().size() > 0)
-       || (argumentsValues.value("").size() < m_defaultArgument->valueNames().size()))) {
+        ((!argumentsValues.contains(QStringLiteral("")) && m_defaultArgument->valueNames().size() > 0)
+         || (argumentsValues.value(QStringLiteral("")).size() < m_defaultArgument->valueNames().size()))) {
         UbuntuI18n* i18n = UbuntuI18n::instance();
         error = i18n->tr("%1 is expecting additional arguments: %2").arg(m_applicationBinary).arg(m_defaultArgument->syntax());
         return false;

=== modified file 'src/UbuntuToolkit/ucbottomedge.cpp'
--- src/UbuntuToolkit/ucbottomedge.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/ucbottomedge.cpp	2016-09-15 14:53:25 +0000
@@ -187,11 +187,11 @@
         }
         QRectF rect(stackedRegion->rect(boundingRect));
         if (rect.contains(regionRect)) {
-            qmlInfo(region) << QString("Region at index %1 contains this region. This region will never activate.").arg(i);
+            qmlInfo(region) << QStringLiteral("Region at index %1 contains this region. This region will never activate.").arg(i);
         } else {
             QRectF intersect = regionRect.intersected(stackedRegion->rect(boundingRect));
             if (!intersect.isNull()) {
-                qmlInfo(region) << QString("Region intersects the one from index %1 having from: %2 and to: %3")
+                qmlInfo(region) << QStringLiteral("Region intersects the one from index %1 having from: %2 and to: %3")
                                    .arg(i)
                                    .arg(UCBottomEdgeRegionPrivate::get(stackedRegion)->from)
                                    .arg(UCBottomEdgeRegionPrivate::get(stackedRegion)->to);
@@ -391,7 +391,7 @@
 
 void UCCollapseAction::activate()
 {
-    setIconName("down");
+    setIconName(QStringLiteral("down"));
 }
 
 // inject collapse action into the content if the content has a PageHeader
@@ -399,7 +399,7 @@
 {
     // ugly, as it can be, as we don't have the PageHeader in cpp to detect the type
     UCHeader *header = currentContentItem ? currentContentItem->findChild<UCHeader*>() : Q_NULLPTR;
-    if (!header || !QuickUtils::inherits(header, "PageHeader")) {
+    if (!header || !QuickUtils::inherits(header, QStringLiteral("PageHeader"))) {
         return;
     }
 

=== modified file 'src/UbuntuToolkit/ucbottomedgehint.cpp'
--- src/UbuntuToolkit/ucbottomedgehint.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/ucbottomedgehint.cpp	2016-09-15 14:53:25 +0000
@@ -59,7 +59,7 @@
      * Therefore we simply set the style name default. Style loading will
      * happen during component completion.
      */
-    styleDocument = "BottomEdgeHintStyle";
+    styleDocument = QStringLiteral("BottomEdgeHintStyle");
 
     // connect old stateChanged
     QObject::connect(q, &QQuickItem::stateChanged, q, &UCBottomEdgeHint::stateChanged);
@@ -179,7 +179,7 @@
 {
     UCActionItem::itemChange(change, data);
     if (change == ItemParentHasChanged) {
-        QQmlProperty bottomAnchors(this, "anchors.bottom", qmlContext(this));
+        QQmlProperty bottomAnchors(this, QStringLiteral("anchors.bottom"), qmlContext(this));
         if (data.item && !QQmlPropertyPrivate::binding(bottomAnchors)) {
             QQuickAnchors *anchors = QQuickItemPrivate::get(this)->anchors();
             anchors->setBottom(QQuickItemPrivate::get(data.item)->bottom());
@@ -357,10 +357,10 @@
     if (!style) {
         return;
     }
-    if (state == "Hidden") {
+    if (state == QStringLiteral("Hidden")) {
         setStatus(Hidden);
     }
-    if (state == "Visible") {
+    if (state == QStringLiteral("Visible")) {
         setStatus(Inactive);
     }
 }

=== modified file 'src/UbuntuToolkit/ucbottomedgeregion.cpp'
--- src/UbuntuToolkit/ucbottomedgeregion.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/ucbottomedgeregion.cpp	2016-09-15 14:53:25 +0000
@@ -457,7 +457,7 @@
     UCBottomEdgeRegionPrivate *d = UCBottomEdgeRegionPrivate::get(this);
     d->from = 0.0;
     d->to = 1.0;
-    setObjectName("default_BottomEdgeRegion");
+    setObjectName(QStringLiteral("default_BottomEdgeRegion"));
 }
 
 bool DefaultRegion::canCommit(qreal dragRatio)

=== modified file 'src/UbuntuToolkit/ucdefaulttheme.cpp'
--- src/UbuntuToolkit/ucdefaulttheme.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/ucdefaulttheme.cpp	2016-09-15 14:53:25 +0000
@@ -28,28 +28,27 @@
 
 UT_NAMESPACE_BEGIN
 
-/*
-  User theme settings are stored in $XDG_CONFIG_HOME/ubuntu-ui-toolkit/theme.ini file, which contains
-  the current global theme name.
-*/
-
-const QString SETTINGS_FILE_FORMAT("%1/ubuntu-ui-toolkit/theme.ini");
-const QString THEME_KEY("theme");
-const QString DEFAULT_THEME("Ubuntu.Components.Themes.Ambiance");
+// User theme settings are stored in
+// $XDG_CONFIG_HOME/ubuntu-ui-toolkit/theme.ini, which contains the current
+// global theme name.
+static const QString settingsFileFormat = QStringLiteral("%1/ubuntu-ui-toolkit/theme.ini");
+static const QString defaultTheme = QStringLiteral("Ubuntu.Components.Themes.Ambiance");
+static const QString themeKey = QStringLiteral("theme");
 
 UCDefaultTheme::UCDefaultTheme(QObject *parent) :
     QObject(parent),
-    m_settings(SETTINGS_FILE_FORMAT.arg(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation)), QSettings::IniFormat)
+    m_settings(settingsFileFormat.arg(
+        QStandardPaths::writableLocation(QStandardPaths::ConfigLocation)), QSettings::IniFormat)
 {
     // fundamental features rely on the default theme, so bail out if it's absent
-    if (!pathFromThemeName(DEFAULT_THEME).isValid()) {
-        qWarning() << "Mandatory default theme" << DEFAULT_THEME << "missing!";
+    if (!pathFromThemeName(defaultTheme).isValid()) {
+        qWarning() << "Mandatory default theme" << defaultTheme << "missing!";
     }
 
     // check if there is a theme settings file, if not, create one
     if (!QFile::exists(m_settings.fileName())) {
         // create the file by writing the default theme
-        m_settings.setValue(THEME_KEY, DEFAULT_THEME);
+        m_settings.setValue(themeKey, defaultTheme);
         m_settings.sync();
     }
 
@@ -63,7 +62,7 @@
     m_settings.sync();
     m_settingsFileWatcher.addPath(m_settings.fileName());
 
-    QString themeName = m_settings.value(THEME_KEY).toString();
+    QString themeName = m_settings.value(themeKey).toString();
     if (themeName != m_themeName) {
         m_themeName = themeName;
         Q_EMIT themeNameChanged();
@@ -79,7 +78,7 @@
 {
     if (themeName != m_themeName) {
         m_themeName = themeName;
-        m_settings.setValue(THEME_KEY, themeName);
+        m_settings.setValue(themeKey, themeName);
         Q_EMIT themeNameChanged();
     }
 }

=== modified file 'src/UbuntuToolkit/ucdeprecatedtheme.cpp'
--- src/UbuntuToolkit/ucdeprecatedtheme.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/ucdeprecatedtheme.cpp	2016-09-15 14:53:25 +0000
@@ -91,13 +91,14 @@
 
     QQmlContext ctx(QQmlEngine::contextForObject(onItem));
     // No warnings due to deprecated code used in the components themselves
-    if (ctx.baseUrl().toString().contains("/Ubuntu/Components/"))
+    if (ctx.baseUrl().toString().contains(QStringLiteral("/Ubuntu/Components/")))
         return;
     // Warnings without a filename are not helpful
     if (ctx.baseUrl().isEmpty())
         return;
 
-    QString noteId(QString("%1.%2").arg(note).arg(onItem->metaObject()->className()));
+    QString noteId(QStringLiteral("%1.%2").arg(
+        QString::fromLatin1(note)).arg(QString::fromLatin1(onItem->metaObject()->className())));
     if (m_notes.contains(noteId))
         return;
     QByteArray suppressNote = qgetenv("SUPPRESS_DEPRECATED_NOTE");
@@ -160,10 +161,10 @@
     QQmlEngine::setContextForObject(oldTheme, context);
 
     // register deprecated Theme property
-    context->setContextProperty("Theme", oldTheme);
+    context->setContextProperty(QStringLiteral("Theme"), oldTheme);
 
     ContextPropertyChangeListener *themeChangeListener =
-        new ContextPropertyChangeListener(context, "Theme");
+        new ContextPropertyChangeListener(context, QStringLiteral("Theme"));
     QObject::connect(oldTheme, SIGNAL(nameChanged()),
                      themeChangeListener, SLOT(updateContextProperty()));
 }

=== modified file 'src/UbuntuToolkit/uchaptics.cpp'
--- src/UbuntuToolkit/uchaptics.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/uchaptics.cpp	2016-09-15 14:53:25 +0000
@@ -159,7 +159,8 @@
         return;
     }
     // load haptics proxy from file system/qrc
-    QUrl path(UbuntuToolkitModule::baseUrl(m_engine).resolved(QUrl("1.1/Haptics.qml")));
+    QUrl path(UbuntuToolkitModule::baseUrl(m_engine).resolved(
+        QUrl(QStringLiteral("1.1/Haptics.qml"))));
 
     QQmlComponent component(m_engine, path, QQmlComponent::PreferSynchronous);
     if (!component.isError()) {

=== modified file 'src/UbuntuToolkit/ucheader.cpp'
--- src/UbuntuToolkit/ucheader.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/ucheader.cpp	2016-09-15 14:53:25 +0000
@@ -89,7 +89,7 @@
 {
     m_showHideAnimation->setParent(this);
     m_showHideAnimation->setTargetObject(this);
-    m_showHideAnimation->setProperty("y");
+    m_showHideAnimation->setProperty(QStringLiteral("y"));
     m_showHideAnimation->setEasing(s_ubuntuAnimation->StandardEasing());
     m_showHideAnimation->setDuration(s_ubuntuAnimation->BriskDuration());
 

=== modified file 'src/UbuntuToolkit/uclabel.cpp'
--- src/UbuntuToolkit/uclabel.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/uclabel.cpp	2016-09-15 14:53:25 +0000
@@ -135,7 +135,7 @@
 
     updatePixelSize();
     QFont defaultFont = q->font();
-    defaultFont.setFamily("Ubuntu");
+    defaultFont.setFamily(QStringLiteral("Ubuntu"));
     defaultFont.setWeight(QFont::Light);
     q->setFont(defaultFont);
     updateRenderType();
@@ -247,11 +247,13 @@
 {
     Q_D(const UCLabel);
     if (d->flags & UCLabelPrivate::TextSizeSet) {
-        return "";
+        return QStringLiteral("");
     }
-    const char* const sizes[] =
-        { "xx-small", "x-small", "small", "medium", "large", "x-large" };
-    return QString(sizes[d->textSize]);
+    static const QString sizes[] = {
+        QStringLiteral("xx-small"), QStringLiteral("x-small"), QStringLiteral("small"),
+        QStringLiteral("medium"), QStringLiteral("large"), QStringLiteral("x-large")
+    };
+    return sizes[d->textSize];
 }
 void UCLabel::setFontSize(const QString& fontSize)
 {

=== modified file 'src/UbuntuToolkit/uclistitem.cpp'
--- src/UbuntuToolkit/uclistitem.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/uclistitem.cpp	2016-09-15 14:53:25 +0000
@@ -223,7 +223,7 @@
 void UCListItemPrivate::init()
 {
     Q_Q(UCListItem);
-    contentItem->setObjectName("ListItemHolder");
+    contentItem->setObjectName(QStringLiteral("ListItemHolder"));
     divider->init(q);
     QQml_setParent_noEvent(contentItem, q);
     contentItem->setParentItem(q);
@@ -247,7 +247,7 @@
     // watch grid unit size change and set implicit size
     QObject::connect(UCUnits::instance(), SIGNAL(gridUnitChanged()), q, SLOT(_q_updateSize()));
     _q_updateSize();
-    styleDocument = "ListItemStyle";
+    styleDocument = QStringLiteral("ListItemStyle");
 
     // create selection object
     selection = new ListItemSelection(q);
@@ -379,7 +379,7 @@
     Q_Q(UCListItem);
     // is there an index context property?
     QQmlContext *context = qmlContext(q);
-    QVariant index = context->contextProperty("index");
+    QVariant index = context->contextProperty(QStringLiteral("index"));
     return index.isValid() ?
                 index.toInt() :
                 (parentItem ? QQuickItemPrivate::get(parentItem)->childItems.indexOf(q) : -1);
@@ -1074,7 +1074,7 @@
         }
         // set the object name for testing purposes
         if (d->dragging()) {
-            setObjectName("DraggedListItem");
+            setObjectName(QStringLiteral("DraggedListItem"));
         }
     }
 }

=== modified file 'src/UbuntuToolkit/uclistitemstyle.cpp'
--- src/UbuntuToolkit/uclistitemstyle.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/uclistitemstyle.cpp	2016-09-15 14:53:25 +0000
@@ -56,10 +56,11 @@
     // grab the animated context property and transfer it to the property
     QQuickItem::classBegin();
     QQmlContext *context = qmlContext(this);
-    if (context && context->contextProperty("animated").isValid()) {
-        setAnimatePanels(context->contextProperty("animated").toBool());
+    if (context && context->contextProperty(QStringLiteral("animated")).isValid()) {
+        setAnimatePanels(context->contextProperty(QStringLiteral("animated")).toBool());
     }
-    m_listItem = qmlContext(this)->contextProperty("styledItem").value<UCListItem*>();
+    m_listItem = qmlContext(this)->contextProperty(
+        QStringLiteral("styledItem")).value<UCListItem*>();
     // get the flickable value
     if (m_listItem) {
         m_flickable = UCListItemPrivate::get(m_listItem)->flickable.data();

=== modified file 'src/UbuntuToolkit/ucmainviewbase.cpp'
--- src/UbuntuToolkit/ucmainviewbase.cpp	2016-09-09 18:16:57 +0000
+++ src/UbuntuToolkit/ucmainviewbase.cpp	2016-09-15 14:53:25 +0000
@@ -150,7 +150,7 @@
 
     d->m_applicationName = applicationName;
 
-    if (applicationName != "") {
+    if (applicationName != QStringLiteral("")) {
         UbuntuI18n::instance()->setDomain(applicationName);
         UCApplication::instance()->setApplicationName(applicationName);
     }

=== modified file 'src/UbuntuToolkit/ucmousefilters.cpp'
--- src/UbuntuToolkit/ucmousefilters.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/ucmousefilters.cpp	2016-09-15 14:53:25 +0000
@@ -400,7 +400,7 @@
 
 UCMouse *UCMouse::qmlAttachedProperties(QObject *owner)
 {
-    return createAttachedFilter<UCMouse>(owner, "Mouse");
+    return createAttachedFilter<UCMouse>(owner, QStringLiteral("Mouse"));
 }
 
 bool UCMouse::eventFilter(QObject *target, QEvent *event)
@@ -1037,7 +1037,7 @@
 
 UCInverseMouse *UCInverseMouse::qmlAttachedProperties(QObject *owner)
 {
-    return createAttachedFilter<UCInverseMouse>(owner, "InverseMouse");
+    return createAttachedFilter<UCInverseMouse>(owner, QStringLiteral("InverseMouse"));
 }
 
 QMouseEvent UCInverseMouse::mapMouseToOwner(QObject *target, QMouseEvent* event)

=== modified file 'src/UbuntuToolkit/ucpagetreenode.cpp'
--- src/UbuntuToolkit/ucpagetreenode.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/ucpagetreenode.cpp	2016-09-15 14:53:25 +0000
@@ -293,36 +293,36 @@
     //print the current nodes properties we are interested in
     switch(QQmlEngine::objectOwnership(currNode)) {
         case QQmlEngine::CppOwnership:
-            PT_TRACE(QString("%1|  ->ownership: ").arg(depth)<<"C++");
+            PT_TRACE(QStringLiteral("%1|  ->ownership: ").arg(depth)<<"C++");
         break;
         case QQmlEngine::JavaScriptOwnership:
-            PT_TRACE(QString("%1|  ->ownership: ").arg(depth)<<"JS");
+            PT_TRACE(QStringLiteral("%1|  ->ownership: ").arg(depth)<<"JS");
         break;
     }
 
-    PT_TRACE(QString("%1|  ->parentNode: ").arg(depth)<<currNode->parentNode());
-    PT_TRACE(QString("%1|  ->parent: ").arg(depth)<<currNode->parent());
-    PT_TRACE(QString("%1|  ->pageStack: ").arg(depth)<<currNode->pageStack()
+    PT_TRACE(QStringLiteral("%1|  ->parentNode: ").arg(depth)<<currNode->parentNode());
+    PT_TRACE(QStringLiteral("%1|  ->parent: ").arg(depth)<<currNode->parent());
+    PT_TRACE(QStringLiteral("%1|  ->pageStack: ").arg(depth)<<currNode->pageStack()
                                <<" custom:"<<((currNode->d_func()->m_flags & UCPageTreeNodePrivate::CustomPageStack) ? true : false));
-    PT_TRACE(QString("%1|  ->propagated: ").arg(depth)<<currNode->propagated()
+    PT_TRACE(QStringLiteral("%1|  ->propagated: ").arg(depth)<<currNode->propagated()
                                <<" custom:"<<((currNode->d_func()->m_flags & UCPageTreeNodePrivate::CustomPropagated) ? true : false));
-    PT_TRACE(QString("%1|  ->active: ").arg(depth)<<currNode->active()
+    PT_TRACE(QStringLiteral("%1|  ->active: ").arg(depth)<<currNode->active()
                                <<" custom:"<<((currNode->d_func()->m_flags & UCPageTreeNodePrivate::CustomActive) ? true : false));
-    PT_TRACE(QString("%1|  ->activeLeaf: ").arg(depth)<<currNode->activeLeafNode());
+    PT_TRACE(QStringLiteral("%1|  ->activeLeaf: ").arg(depth)<<currNode->activeLeafNode());
 
     if (n.m_children.length())
-        PT_TRACE(QString("%1|  ->isLeaf: ").arg(depth)<<currNode->isLeaf());
+        PT_TRACE(QStringLiteral("%1|  ->isLeaf: ").arg(depth)<<currNode->isLeaf());
     else
-        PT_TRACE(QString("%1└  ->isLeaf: ").arg(depth)<<currNode->isLeaf());
+        PT_TRACE(QStringLiteral("%1└  ->isLeaf: ").arg(depth)<<currNode->isLeaf());
 
     //print the current nodes children
     for (int i = 0; i < n.m_children.length(); i++) {
         QString subDepth = depth;
 
         if (i == n.m_children.length() - 1 ) //last
-            subDepth.append("   ");
+            subDepth.append(QStringLiteral("   "));
         else
-            subDepth.append("|  ");
+            subDepth.append(QStringLiteral("|  "));
 
         dumpNode(n.m_children.at(i), depth, subDepth, false);
     }

=== modified file 'src/UbuntuToolkit/ucqquickimageextension.cpp'
--- src/UbuntuToolkit/ucqquickimageextension.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/ucqquickimageextension.cpp	2016-09-15 14:53:25 +0000
@@ -87,14 +87,15 @@
         return;
     }
 
-    int separatorPosition = resolved.indexOf("/");
+    int separatorPosition = resolved.indexOf(QStringLiteral("/"));
     QString scaleFactor = resolved.left(separatorPosition);
     QString selectedFilePath = resolved.mid(separatorPosition+1);
-    QString fragment(m_source.hasFragment() ? "#" + m_source.fragment() : QString(""));
+    QString fragment(m_source.hasFragment() ? "#" + m_source.fragment() : QStringLiteral(""));
 
-    if (scaleFactor == "1") {
+    if (scaleFactor == QStringLiteral("1")) {
         if (qFuzzyCompare(qGuiApp->devicePixelRatio(), (qreal)1.0)
-                || selectedFilePath.endsWith(".svg") || selectedFilePath.endsWith(".svgz")) {
+            || selectedFilePath.endsWith(QStringLiteral(".svg"))
+            || selectedFilePath.endsWith(QStringLiteral(".svgz"))) {
             // Take care to pass the original fragment
             QUrl selectedFileUrl(QUrl::fromLocalFile(selectedFilePath));
             selectedFileUrl.setFragment(fragment);
@@ -109,8 +110,8 @@
         }
     } else {
         // Prepend "image://scaling" for the image to be loaded by UCScalingImageProvider.
-        if (!m_source.path().endsWith(".sci")) {
-            // Regular image file
+        if (!m_source.path().endsWith(QStringLiteral(".sci"))) {
+          // Regular image file
             m_image->setSource(QUrl("image://scaling/" + resolved + fragment));
         } else {
             // .sci image file. Rewrite the .sci file into a temporary file.
@@ -161,9 +162,9 @@
         QTextStream sciStream(&sciFile);
         while (!sciStream.atEnd()) {
             QString line = sciStream.readLine();
-            if (line.startsWith("border")) {
+            if (line.startsWith(QStringLiteral("border"))) {
                 output << scaledBorder(line, scaleFactor) << endl;
-            } else if (line.startsWith("source")) {
+            } else if (line.startsWith(QStringLiteral("source"))) {
                 output << scaledSource(line, sciFilePath, scaleFactor) << endl;
             } else {
                 output << line << endl;
@@ -178,7 +179,7 @@
 QString UCQQuickImageExtension::scaledBorder(const QString &border, const QString &scaleFactor)
 {
     // Rewrite the border line with a scaled border value
-    QStringList parts = border.split(":");
+    QStringList parts = border.split(QStringLiteral(":"));
     float scaledValue = parts[1].toFloat() * scaleFactor.toFloat();
     return parts[0] + ": " + QString::number(qRound(scaledValue));
 }
@@ -200,7 +201,8 @@
         source.remove(quoteLastIndex, 1);
     }
 
-    return source.replace("source: ", "source: " + QString(quote) + baseUrl).append(quote);
+    return source.replace(
+        QStringLiteral("source: "), "source: " + QString(quote) + baseUrl).append(quote);
 }
 
 UT_NAMESPACE_END

=== modified file 'src/UbuntuToolkit/ucscalingimageprovider.cpp'
--- src/UbuntuToolkit/ucscalingimageprovider.cpp	2016-07-07 07:21:48 +0000
+++ src/UbuntuToolkit/ucscalingimageprovider.cpp	2016-09-15 14:53:25 +0000
@@ -40,9 +40,9 @@
 
 QImage UCScalingImageProvider::requestImage(const QString &id, QSize *size, const QSize &requestedSize)
 {
-    int separatorPosition = id.indexOf("/");
+    int separatorPosition = id.indexOf(QStringLiteral("/"));
     float scaleFactor = id.left(separatorPosition).toFloat();
-    int fragmentPosition = id.lastIndexOf("#");
+    int fragmentPosition = id.lastIndexOf(QStringLiteral("#"));
     int pathLength = fragmentPosition > -1 ? fragmentPosition - separatorPosition - 1 : -1;
     QString path = id.mid(separatorPosition + 1, pathLength);
     QFile file(path);

=== modified file 'src/UbuntuToolkit/ucserviceproperties.cpp'
--- src/UbuntuToolkit/ucserviceproperties.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/ucserviceproperties.cpp	2016-09-15 14:53:25 +0000
@@ -48,10 +48,10 @@
     if (error.isEmpty()) {
         setError(message);
     } else {
-        setError(QString("%1\n%2").arg(error).arg(message));
+        setError(QStringLiteral("%1\n%2").arg(error).arg(message));
     }
-    QString env = qgetenv("SHOW_SERVICEPROPERTIES_WARNINGS");
-    if (!env.isEmpty() && (env == "1" || env.toLower() == "true")) {
+    QString env = QString::fromLocal8Bit(qgetenv("SHOW_SERVICEPROPERTIES_WARNINGS"));
+    if (!env.isEmpty() && (env == QStringLiteral("1") || env.toLower() == QStringLiteral("true"))) {
         qmlInfo(q_ptr) << message;
     }
 }
@@ -154,7 +154,7 @@
     const QMetaObject *mo = metaObject();
     for (int i = mo->propertyOffset(); i < mo->propertyCount(); i++) {
         const QMetaProperty prop = mo->property(i);
-        QString property(prop.name());
+        QString property(QString::fromLatin1(prop.name()));
 
         // check the binding on the property and warn if there is one.
         QQmlProperty qmlProperty(this, property);

=== modified file 'src/UbuntuToolkit/ucstatesaver.cpp'
--- src/UbuntuToolkit/ucstatesaver.cpp	2016-09-09 18:16:57 +0000
+++ src/UbuntuToolkit/ucstatesaver.cpp	2016-09-15 14:53:25 +0000
@@ -102,7 +102,7 @@
     QObject *parent = m_attachee->parent();
 
     // check whether we have an "index" context property defined
-    QVariant indexValue = attacheeContext->contextProperty("index");
+    QVariant indexValue = attacheeContext->contextProperty(QStringLiteral("index"));
     if (indexValue.isValid() && (indexValue.type() == QVariant::Int)) {
         path += indexValue.toString();
     }

=== modified file 'src/UbuntuToolkit/ucstyleditembase.cpp'
--- src/UbuntuToolkit/ucstyleditembase.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/ucstyleditembase.cpp	2016-09-15 14:53:25 +0000
@@ -386,8 +386,8 @@
     }
     styleItemContext = new QQmlContext(creationContext);
     styleItemContext->setContextObject(q);
-    styleItemContext->setContextProperty("styledItem", q);
-    styleItemContext->setContextProperty("animated", animated);
+    styleItemContext->setContextProperty(QStringLiteral("styledItem"), q);
+    styleItemContext->setContextProperty(QStringLiteral("animated"), animated);
     QObject *object = component->beginCreate(styleItemContext);
     if (!object) {
         delete styleItemContext;
@@ -415,7 +415,7 @@
 
     // make sure we reset the animated property to true
     if (!animated) {
-        styleItemContext->setContextProperty("animated", true);
+        styleItemContext->setContextProperty(QStringLiteral("animated"), true);
     }
 
     // set implicit size

=== modified file 'src/UbuntuToolkit/ucstylehints.cpp'
--- src/UbuntuToolkit/ucstylehints.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/ucstylehints.cpp	2016-09-15 14:53:25 +0000
@@ -36,7 +36,8 @@
 void UCStyleHintsParser::verifyProperty(const QV4::CompiledData::Unit *qmlUnit, const QV4::CompiledData::Binding *binding)
 {
     if (binding->type == QV4::CompiledData::Binding::Type_Object) {
-        error(qmlUnit->objectAt(binding->value.objectIndex), "StyleHints does not support creating state-specific objects.");
+        error(qmlUnit->objectAt(binding->value.objectIndex),
+              QStringLiteral("StyleHints does not support creating state-specific objects."));
         return;
     }
 
@@ -52,8 +53,8 @@
 
     // filter out signals!
     QString propertyName = qmlUnit->stringAt(binding->propertyNameIndex);
-    if (propertyName.startsWith("on") && propertyName.at(2).isUpper()) {
-        error(binding, "Signal properties are not supported.");
+    if (propertyName.startsWith(QStringLiteral("on")) && propertyName.at(2).isUpper()) {
+        error(binding, QStringLiteral("Signal properties are not supported."));
         return;
     }
 }
@@ -142,7 +143,7 @@
 void UCStyleHints::propertyNotFound(const QString &styleName, const QString &property)
 {
     if (!m_ignoreUnknownProperties) {
-        qmlInfo(this) << QString("Style '%1' has no property called '%2'.").arg(styleName).arg(property);
+        qmlInfo(this) << QStringLiteral("Style '%1' has no property called '%2'.").arg(styleName).arg(property);
     }
 }
 

=== modified file 'src/UbuntuToolkit/uctheme.cpp'
--- src/UbuntuToolkit/uctheme.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/uctheme.cpp	2016-09-15 14:53:25 +0000
@@ -46,8 +46,6 @@
 
 UT_NAMESPACE_BEGIN
 
-const char *CONTEXT_THEME = "theme";
-quint16 UCTheme::previousVersion = 0;
 /*!
  * \qmltype ThemeSettings
  * \instantiates UCTheme
@@ -147,8 +145,11 @@
  * \sa {StyledItem}
  */
 
-const QString THEME_FOLDER_FORMAT("%1/%2/");
-const QString PARENT_THEME_FILE("parent_theme");
+static const QString contextTheme = QStringLiteral("theme");
+static const QString themeFolderFormat = QStringLiteral("%1/%2/");
+static const QString parentThemeFile = QStringLiteral("parent_theme");
+
+quint16 UCTheme::previousVersion = 0;
 
 static inline void updateBinding (QQmlAbstractBinding *binding)
 {
@@ -177,7 +178,7 @@
     }
 
     // append QML import path(s); we must explicitly support env override here
-    QString qml2ImportPath(getenv("QML2_IMPORT_PATH"));
+    const QString qml2ImportPath = QString::fromLocal8Bit(getenv("QML2_IMPORT_PATH"));
     if (!qml2ImportPath.isEmpty()) {
         pathList << qml2ImportPath.split(':', QString::SkipEmptyParts);
     }
@@ -201,7 +202,7 @@
     themeName.replace('.', '/');
     QStringList pathList = themeSearchPath();
     Q_FOREACH(const QString &path, pathList) {
-        QString themeFolder = THEME_FOLDER_FORMAT.arg(path, themeName);
+        QString themeFolder = themeFolderFormat.arg(path, themeName);
         // QUrl needs a trailing slash to understand it's a directory
         QString absoluteThemeFolder = QDir(themeFolder).absolutePath().append('/');
         if (QDir(absoluteThemeFolder).exists()) {
@@ -220,7 +221,7 @@
     if (!themePath.isValid()) {
         qWarning() << qPrintable(QStringLiteral("Theme not found: \"%1\"").arg(themePath.name));
     } else {
-        QFile file(themePath.path.resolved(PARENT_THEME_FILE).toLocalFile());
+        QFile file(themePath.path.resolved(parentThemeFile).toLocalFile());
         if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
             QTextStream in(&file);
             parentTheme = in.readLine();
@@ -306,17 +307,18 @@
     if (!palette) {
         return;
     }
-    const char *valueSetList[10] = {"normal", "selected"};
+    const char* valueSetString[2] = { "normal", "selected" };
+    const QString valueSetQString[2] = { QStringLiteral("normal"), QStringLiteral("selected") };
     QQmlContext *configContext = qmlContext(palette);
 
     for (int i = 0; i < 2; i++) {
-        const char *valueSet = valueSetList[i];
-        QObject *configObject = palette->property(valueSet).value<QObject*>();
+        QObject *configObject = palette->property(valueSetString[i]).value<QObject*>();
         const QMetaObject *mo = configObject->metaObject();
 
         for (int ii = mo->propertyOffset(); ii < mo->propertyCount(); ii++) {
             const QMetaProperty prop = mo->property(ii);
-            QString propertyName = QString("%1.%2").arg(valueSet).arg(prop.name());
+            QString propertyName = QStringLiteral("%1.%2")
+                .arg(valueSetQString[i]).arg(QString::fromLatin1(prop.name()));
             QQmlProperty configProperty(palette, propertyName, configContext);
 
             // first we need to check whether the property has a binding or not
@@ -390,7 +392,7 @@
     }
     UCTheme *theme = Q_NULLPTR;
     for (int tryCount = 0; !theme && tryCount < 2; tryCount++) {
-        theme = engine->rootContext()->contextProperty(CONTEXT_THEME).value<UCTheme*>();
+        theme = engine->rootContext()->contextProperty(contextTheme).value<UCTheme*>();
         if (!theme) {
             createDefaultTheme(engine);
         }
@@ -403,11 +405,11 @@
     // FIXME: move this into QPA
     // set the default font
     QFont defaultFont = QGuiApplication::font();
-    defaultFont.setFamily("Ubuntu");
-    defaultFont.setPixelSize(UCFontUtils::instance()->sizeToPixels("medium"));
+    defaultFont.setFamily(QStringLiteral("Ubuntu"));
+    defaultFont.setPixelSize(UCFontUtils::instance()->sizeToPixels(QStringLiteral("medium")));
     defaultFont.setWeight(QFont::Light);
     QGuiApplication::setFont(defaultFont);
-    setObjectName("default");
+    setObjectName(QStringLiteral("default"));
 }
 
 void UCTheme::init()
@@ -584,7 +586,7 @@
     if (config == m_palette || config == m_config.palette) {
         return;
     }
-    if (config && !QuickUtils::inherits(config, "Palette")) {
+    if (config && !QuickUtils::inherits(config, QStringLiteral("Palette"))) {
         qmlInfo(config) << QStringLiteral("Not a Palette component.");
         return;
     }
@@ -671,13 +673,13 @@
 
     UCTheme *theme = new UCTheme(engine);
     QQmlEngine::setContextForObject(theme, context);
-    context->setContextProperty(CONTEXT_THEME, theme);
+    context->setContextProperty(contextTheme, theme);
 
     theme->setupDefault();
     theme->updateEnginePaths(engine);
 
     ContextPropertyChangeListener *listener =
-        new ContextPropertyChangeListener(context, CONTEXT_THEME);
+        new ContextPropertyChangeListener(context, contextTheme);
     QObject::connect(theme, &UCTheme::nameChanged,
                      listener, &ContextPropertyChangeListener::updateContextProperty);
 }
@@ -776,7 +778,8 @@
         m_palette = 0;
     }
     // theme may not have palette defined
-    QUrl paletteUrl = styleUrl("Palette.qml", previousVersion ? previousVersion : LATEST_UITK_VERSION);
+    QUrl paletteUrl = styleUrl(
+        QStringLiteral("Palette.qml"), previousVersion ? previousVersion : LATEST_UITK_VERSION);
     if (paletteUrl.isValid()) {
         m_palette = QuickUtils::instance()->createQmlObject(paletteUrl, engine);
         if (m_palette) {

=== modified file 'src/UbuntuToolkit/ucthemingextension.cpp'
--- src/UbuntuToolkit/ucthemingextension.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/ucthemingextension.cpp	2016-09-15 14:53:25 +0000
@@ -226,8 +226,9 @@
     if (!theme) {
         theme = UCTheme::defaultTheme(qmlEngine(themedItem));
         if (!theme) {
-            QString msg = QStringLiteral("The item %1 was created without a valid QML Engine. Styling will not be possible.")
-                    .arg(themedItem->metaObject()->className());
+            QString msg = QStringLiteral(
+                "The item %1 was created without a valid QML Engine. Styling will not be possible.")
+                .arg(QString::fromLatin1(themedItem->metaObject()->className()));
             qCritical().noquote() << msg;
             return Q_NULLPTR;
         }

=== modified file 'src/UbuntuToolkit/ucubuntushape.cpp'
--- src/UbuntuToolkit/ucubuntushape.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/ucubuntushape.cpp	2016-09-15 14:53:25 +0000
@@ -411,7 +411,8 @@
 */
 void UCUbuntuShape::setRadius(const QString& radius)
 {
-  const Radius newRadius = (radius == "medium") ? Medium : ((radius == "large") ? Large : Small);
+    const Radius newRadius = (radius == QStringLiteral("medium")) ?
+        Medium : ((radius == QStringLiteral("large")) ? Large : Small);
     if (m_radius != newRadius) {
         m_radius = newRadius;
         update();
@@ -855,9 +856,9 @@
 
     if (!(m_flags & AspectSet)) {
         quint8 aspect;
-        if (borderSource.endsWith(QString("radius_idle.sci"))) {
+        if (borderSource.endsWith(QStringLiteral("radius_idle.sci"))) {
             aspect = Inset;
-        } else if (borderSource.endsWith(QString("radius_pressed.sci"))) {
+        } else if (borderSource.endsWith(QStringLiteral("radius_pressed.sci"))) {
             aspect = Pressed;
         } else {
             aspect = Flat;

=== modified file 'src/UbuntuToolkit/ucubuntushape_p.h'
--- src/UbuntuToolkit/ucubuntushape_p.h	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/ucubuntushape_p.h	2016-09-15 14:53:25 +0000
@@ -197,7 +197,8 @@
     enum WrapMode { Transparent = 0, Repeat = 1 };
 
     QString radius() const {
-      return (m_radius == Small) ? "small" : ((m_radius == Medium) ? "medium" : "large"); }
+      return (m_radius == Small) ? QStringLiteral("small")
+          : ((m_radius == Medium) ? QStringLiteral("medium") : QStringLiteral("large")); }
     void setRadius(const QString& radius);
     Aspect aspect() const { return (m_flags & AspectSet) ? static_cast<Aspect>(m_aspect) : Flat; }
     void setAspect(Aspect aspect);
@@ -239,9 +240,10 @@
     void setBackgroundMode(BackgroundMode backgroundMode);
 
     QString borderSource() const {
-        return (m_flags & AspectSet) ? "" :
-            ((m_aspect == Flat) ? "" :
-             ((m_aspect == Inset) ? "radius_idle.sci" : "radius_pressed.sci")); }
+        return (m_flags & AspectSet) ? QStringLiteral("") :
+            ((m_aspect == Flat) ? QStringLiteral("") :
+             ((m_aspect == Inset) ? QStringLiteral("radius_idle.sci") :
+              QStringLiteral("radius_pressed.sci"))); }
     void setBorderSource(const QString& borderSource);
     QColor color() const {
         return (m_flags & BackgroundApiSet) ?

=== modified file 'src/UbuntuToolkit/ucunits.cpp'
--- src/UbuntuToolkit/ucunits.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/ucunits.cpp	2016-09-15 14:53:25 +0000
@@ -249,7 +249,7 @@
 
 float UCUnits::gridUnitSuffixFromFileName(const QString& fileName)
 {
-    QRegularExpression re("^.*@([0-9]*).*$");
+    QRegularExpression re(QStringLiteral("^.*@([0-9]*).*$"));
     QRegularExpressionMatch match = re.match(fileName);
     if (match.hasMatch()) {
         return match.captured(1).toFloat();
@@ -281,13 +281,13 @@
      */
     if (qGuiApp->allWindows().count() > 1) {
         if (window && window->screen()
-                && window->screen()->name().contains("LVDS")) {
+            && window->screen()->name().contains(QStringLiteral("LVDS"))) {
             return;
         }
     }
 
     auto nativeInterface = qGuiApp->platformNativeInterface();
-    QVariant scaleVal = nativeInterface->windowProperty(window, "scale");
+    QVariant scaleVal = nativeInterface->windowProperty(window, QStringLiteral("scale"));
     if (!scaleVal.isValid()) {
         return;
     }

=== modified file 'src/UbuntuToolkit/ucurihandler.cpp'
--- src/UbuntuToolkit/ucurihandler.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/ucurihandler.cpp	2016-09-15 14:53:25 +0000
@@ -76,7 +76,7 @@
         return;
     }
     char* path = nih_dbus_path(NULL, "", applicationId.constData(), NULL);
-    objectPath = QString(path);
+    objectPath = QString::fromLocal8Bit(path);
     nih_free(path);
 
     // Ensure handler is running on the main thread.

=== modified file 'src/UbuntuToolkit/unitythemeiconprovider.cpp'
--- src/UbuntuToolkit/unitythemeiconprovider.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/unitythemeiconprovider.cpp	2016-09-15 14:53:25 +0000
@@ -96,10 +96,13 @@
             if (QFileInfo::exists(filename)) {
                 QSettings settings(filename, QSettings::IniFormat);
 
-                Q_FOREACH(const QString &path, settings.value("Icon Theme/Directories").toStringList()) {
+                const QStringList themeDirectories =
+                    settings.value(QStringLiteral("Icon Theme/Directories")).toStringList();
+                Q_FOREACH(const QString &path, themeDirectories) {
                     Directory dir;
                     dir.path = path;
-                    dir.sizeType = sizeTypeFromString(settings.value(path + "/Type", "Fixed").toString());
+                    dir.sizeType = sizeTypeFromString(
+                        settings.value(path + "/Type", QStringLiteral("Fixed")).toString());
                     dir.size = settings.value(path + "/Size", 32).toInt();
                     dir.minSize = settings.value(path + "/MinSize", 0).toInt();
                     dir.maxSize = settings.value(path + "/MaxSize", 0).toInt();
@@ -107,7 +110,9 @@
                     directories.append(dir);
                 }
 
-                Q_FOREACH(const QString &name, settings.value("Icon Theme/Inherits").toStringList()) {
+                const QStringList themeInherits =
+                    settings.value(QStringLiteral("Icon Theme/Inherits")).toStringList();
+                Q_FOREACH(const QString &name, themeInherits) {
                     if (name != QLatin1String("hicolor")) {
                         parents.append(IconTheme::get(name));
                     }