From 15cd326a05d4f92c780a9357f3e715e1bd02989e Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@theqtcompany.com>
Date: Wed, 11 Mar 2015 12:39:23 +0100
Subject: QQuickStyle: fix build on Linux / GCC 4.9

Change-Id: Ic42631cdcb207df98fe0337398580c686605a8f6
Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
---
 src/imports/controls/qquickstyle.cpp            | 2 +-
 src/imports/controls/qtquickcontrols2plugin.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/imports/controls')

diff --git a/src/imports/controls/qquickstyle.cpp b/src/imports/controls/qquickstyle.cpp
index 54abbbf6..91c1e2da 100644
--- a/src/imports/controls/qquickstyle.cpp
+++ b/src/imports/controls/qquickstyle.cpp
@@ -110,7 +110,7 @@ QT_BEGIN_NAMESPACE
     \qmlattachedproperty real QtQuickControls2::Style::disabledOpacity
 */
 
-Q_GLOBAL_STATIC_WITH_ARGS(QQuickStyleData, globalStyleData, QStringLiteral(":/qtquickcontrols/style.json"))
+Q_GLOBAL_STATIC_WITH_ARGS(QQuickStyleData, globalStyleData, (QString::fromLatin1(":/qtquickcontrols/style.json")))
 
 static QQuickStyle *styleInstance(QQmlEngine *engine)
 {
diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp
index 7c7d2bf9..7fbdfc8e 100644
--- a/src/imports/controls/qtquickcontrols2plugin.cpp
+++ b/src/imports/controls/qtquickcontrols2plugin.cpp
@@ -35,6 +35,7 @@
 ****************************************************************************/
 
 #include <QtQml/qqmlextensionplugin.h>
+#include "qquickstyle_p.h"
 
 #include <QtQuickControls/private/qquickabstractapplicationwindow_p.h>
 #include <QtQuickControls/private/qquickabstractbusyindicator_p.h>
@@ -61,7 +62,6 @@
 
 #include <QtQuickControls/private/qquickcontrol_p.h>
 #include <QtQuickControls/private/qquickexclusivegroup_p.h>
-#include <QtQuickControls/private/qquickstyle_p.h>
 
 void initResources()
 {
-- 
cgit v1.2.3