From e296dbcf5dc70a102b5e865277e52ba550619f0f Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 12 Oct 2011 10:50:50 +0200 Subject: [PATCH] Fix compilation on Harmattan Fix issues with QString::QString(const char*)' being private Change-Id: Ie3152d5fe952976dbda0ecb9dc28f9b6b5a1fab4 Reviewed-on: http://codereview.qt-project.org/6508 Sanity-Review: Qt Sanity Bot Reviewed-by: Alan Alpert Reviewed-by: Kent Hansen --- tools/qmlviewer/deviceorientation_harmattan.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tools/qmlviewer/deviceorientation_harmattan.cpp b/tools/qmlviewer/deviceorientation_harmattan.cpp index b3b3fe5..c5e329b 100644 --- a/tools/qmlviewer/deviceorientation_harmattan.cpp +++ b/tools/qmlviewer/deviceorientation_harmattan.cpp @@ -43,13 +43,13 @@ #include #include -#define ORIENTATION_SERVICE "com.nokia.SensorService" -#define ORIENTATION_PATH "/org/maemo/contextkit/Screen/TopEdge" -#define CONTEXT_INTERFACE "org.maemo.contextkit.Property" -#define CONTEXT_CHANGED "ValueChanged" -#define CONTEXT_SUBSCRIBE "Subscribe" -#define CONTEXT_UNSUBSCRIBE "Unsubscribe" -#define CONTEXT_GET "Get" +#define ORIENTATION_SERVICE QStringLiteral("com.nokia.SensorService") +#define ORIENTATION_PATH QStringLiteral("/org/maemo/contextkit/Screen/TopEdge") +#define CONTEXT_INTERFACE QStringLiteral("org.maemo.contextkit.Property") +#define CONTEXT_CHANGED QStringLiteral("ValueChanged") +#define CONTEXT_SUBSCRIBE QStringLiteral("Subscribe") +#define CONTEXT_UNSUBSCRIBE QStringLiteral("Unsubscribe") +#define CONTEXT_GET QStringLiteral("Get") class HarmattanOrientation : public DeviceOrientation @@ -136,13 +136,13 @@ private Q_SLOTS: private: static Orientation toOrientation(const QString &nativeOrientation) { - if (nativeOrientation == "top") + if (nativeOrientation == QLatin1String("top")) return Landscape; - else if (nativeOrientation == "left") + else if (nativeOrientation == QLatin1String("left")) return Portrait; - else if (nativeOrientation == "bottom") + else if (nativeOrientation == QLatin1String("bottom")) return LandscapeInverted; - else if (nativeOrientation == "right") + else if (nativeOrientation == QLatin1String("right")) return PortraitInverted; return UnknownOrientation; } -- 2.7.4