Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: I05fcd8dc66d9ad0dc76bb7f5bae05c9876bfba14

3 files changed, 4 insertions, 4 deletions

diff --git a/src/plugins/platforms/qnx/qqnxbuttoneventnotifier.cpp b/src/plugins/platforms/qnx/qqnxbuttoneventnotifier.cpp
index bd5c3d51d2..4e83f75a1a 100644
--- a/src/plugins/platforms/qnx/qqnxbuttoneventnotifier.cpp
+++ b/src/plugins/platforms/qnx/qqnxbuttoneventnotifier.cpp
@@ -127,7 +127,7 @@ void QQnxButtonEventNotifier::updateButtonStates()
     for (int buttonId = bid_minus; buttonId < ButtonCount; ++buttonId) {
         // Extract the new button state
         QByteArray key = m_buttonKeys.at(buttonId);
-        ButtonState newState = (fields.value(key) == QByteArrayLiteral("b_up") ? ButtonUp : ButtonDown);
+        ButtonState newState = (fields.value(key) == "b_up" ? ButtonUp : ButtonDown);
 
         // If state has changed, update our state and inject a keypress event
         if (m_state[buttonId] != newState) {
diff --git a/src/plugins/platforms/qnx/qqnxnativeinterface.cpp b/src/plugins/platforms/qnx/qqnxnativeinterface.cpp
index 224a3c130d..c837e67482 100644
--- a/src/plugins/platforms/qnx/qqnxnativeinterface.cpp
+++ b/src/plugins/platforms/qnx/qqnxnativeinterface.cpp
@@ -107,9 +107,9 @@ void QQnxNativeInterface::setWindowProperty(QPlatformWindow *window, const QStri
 {
     QQnxWindow *qnxWindow = static_cast<QQnxWindow*>(window);
 
-    if (name == QStringLiteral("mmRendererWindowName")) {
+    if (name == QLatin1String("mmRendererWindowName")) {
         qnxWindow->setMMRendererWindowName(value.toString());
-    } else if (name == QStringLiteral("qnxWindowGroup")) {
+    } else if (name == QLatin1String("qnxWindowGroup")) {
         if (value.isNull())
             qnxWindow->joinWindowGroup(QByteArray());
         else if (value.canConvert<QByteArray>())
diff --git a/src/plugins/platforms/qnx/qqnxwindow.cpp b/src/plugins/platforms/qnx/qqnxwindow.cpp
index 1a56dc0f04..0ea6693c64 100644
--- a/src/plugins/platforms/qnx/qqnxwindow.cpp
+++ b/src/plugins/platforms/qnx/qqnxwindow.cpp
@@ -75,7 +75,7 @@ QT_BEGIN_NAMESPACE
     the default behavior suffices, some circumstances require greater control over the
     interaction with screen.
 
-    \section1 Window types
+    \section1 Window Types
 
     The QNX QPA plugin can operate in two modes, with or without a root window. The
     selection of mode is made via the \e rootwindow and \e no-rootwindow options to the