aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-03-11 12:39:23 +0100
committerJari-Pekka Nurmi <jpnurmi@theqtcompany.com>2015-03-11 13:39:52 +0200
commit15cd326a05d4f92c780a9357f3e715e1bd02989e (patch)
tree8f7e883c68c64dcdd783fc733f1dc11751d15a42 /src/imports/controls
parenta3921bcf01275425350c9c153fe92086a34d1403 (diff)
QQuickStyle: fix build on Linux / GCC 4.9
Change-Id: Ic42631cdcb207df98fe0337398580c686605a8f6 Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports/controls')
-rw-r--r--src/imports/controls/qquickstyle.cpp2
-rw-r--r--src/imports/controls/qtquickcontrols2plugin.cpp2
2 files changed, 2 insertions, 2 deletions
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()
{