diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 17:56:51 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 17:56:52 +0200 |
commit | 881ceeff428c377d02ae3881beccdbb028385075 (patch) | |
tree | 65bd4335d7f67b81b04e33f2cbb17a41cf966dd8 /src/plugins/bearer | |
parent | b3d2c867ed14cd6337d5e32b8750f198b5b7d331 (diff) | |
parent | 106487387d493dab934e19b33bfed55b8df62d67 (diff) |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I05fcd8dc66d9ad0dc76bb7f5bae05c9876bfba14
Diffstat (limited to 'src/plugins/bearer')
-rw-r--r-- | src/plugins/bearer/android/src/main.cpp | 2 | ||||
-rw-r--r-- | src/plugins/bearer/blackberry/main.cpp | 2 | ||||
-rw-r--r-- | src/plugins/bearer/connman/qconnmanengine.cpp | 4 | ||||
-rw-r--r-- | src/plugins/bearer/connman/qconnmanservice_linux.cpp | 2 | ||||
-rw-r--r-- | src/plugins/bearer/connman/qofonoservice_linux.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/bearer/android/src/main.cpp b/src/plugins/bearer/android/src/main.cpp index 777d262d6b..7b24f5b2ce 100644 --- a/src/plugins/bearer/android/src/main.cpp +++ b/src/plugins/bearer/android/src/main.cpp @@ -46,7 +46,7 @@ class QAndroidBearerEnginePlugin : public QBearerEnginePlugin public: QBearerEngine *create(const QString &key) const Q_DECL_OVERRIDE { - return (key == QStringLiteral("android")) ? new QAndroidBearerEngine() : 0; + return (key == QLatin1String("android")) ? new QAndroidBearerEngine() : 0; } }; diff --git a/src/plugins/bearer/blackberry/main.cpp b/src/plugins/bearer/blackberry/main.cpp index a8177ff192..bc25647f8a 100644 --- a/src/plugins/bearer/blackberry/main.cpp +++ b/src/plugins/bearer/blackberry/main.cpp @@ -50,7 +50,7 @@ public: QBearerEngine *QBBEnginePlugin::create(const QString &key) const { - if (key == QStringLiteral("blackberry")) + if (key == QLatin1String("blackberry")) return new QBBEngine; return 0; diff --git a/src/plugins/bearer/connman/qconnmanengine.cpp b/src/plugins/bearer/connman/qconnmanengine.cpp index bbff154ff5..733b6f131f 100644 --- a/src/plugins/bearer/connman/qconnmanengine.cpp +++ b/src/plugins/bearer/connman/qconnmanengine.cpp @@ -332,7 +332,7 @@ void QConnmanEngine::serviceStateChanged(const QString &state) QConnmanServiceInterface *service = qobject_cast<QConnmanServiceInterface *>(sender()); configurationChange(service); - if (state == QStringLiteral("failure")) { + if (state == QLatin1String("failure")) { emit connectionError(service->path(), ConnectError); } } @@ -516,7 +516,7 @@ void QConnmanEngine::addServiceConfiguration(const QString &servicePath) cpPriv->id = servicePath; cpPriv->type = QNetworkConfiguration::InternetAccessPoint; - if (service->security() == QStringLiteral("none")) { + if (service->security() == QLatin1String("none")) { cpPriv->purpose = QNetworkConfiguration::PublicPurpose; } else { cpPriv->purpose = QNetworkConfiguration::PrivatePurpose; diff --git a/src/plugins/bearer/connman/qconnmanservice_linux.cpp b/src/plugins/bearer/connman/qconnmanservice_linux.cpp index 23860077d7..65c4ac307a 100644 --- a/src/plugins/bearer/connman/qconnmanservice_linux.cpp +++ b/src/plugins/bearer/connman/qconnmanservice_linux.cpp @@ -338,7 +338,7 @@ void QConnmanServiceInterface::connectNotify(const QMetaMethod &signal) void QConnmanServiceInterface::changedProperty(const QString &name, const QDBusVariant &value) { propertiesCacheMap[name] = value.variant(); - if (name == QStringLiteral("State")) + if (name == QLatin1String("State")) Q_EMIT stateChanged(value.variant().toString()); } diff --git a/src/plugins/bearer/connman/qofonoservice_linux.cpp b/src/plugins/bearer/connman/qofonoservice_linux.cpp index fdd8a9c8d5..acc82bda04 100644 --- a/src/plugins/bearer/connman/qofonoservice_linux.cpp +++ b/src/plugins/bearer/connman/qofonoservice_linux.cpp @@ -290,7 +290,7 @@ QVariantMap &QOfonoDataConnectionManagerInterface::getProperties() void QOfonoDataConnectionManagerInterface::propertyChanged(const QString &name, const QDBusVariant &value) { propertiesMap[name] = value.variant(); - if (name == QStringLiteral("RoamingAllowed")) + if (name == QLatin1String("RoamingAllowed")) Q_EMIT roamingAllowedChanged(value.variant().toBool()); } |