summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2011-10-12 10:50:50 +0200
committerQt by Nokia <qt-info@nokia.com>2011-10-12 11:42:46 +0200
commite296dbcf5dc70a102b5e865277e52ba550619f0f (patch)
tree396bb9333de54976b87cf6875a5720444393081e /tools
parent73f7ec2a06e4957fd8306d4b3655ed9d2101db21 (diff)
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 <qt_sanity_bot@ovi.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/qmlviewer/deviceorientation_harmattan.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/tools/qmlviewer/deviceorientation_harmattan.cpp b/tools/qmlviewer/deviceorientation_harmattan.cpp
index b3b3fe54d7..c5e329b152 100644
--- a/tools/qmlviewer/deviceorientation_harmattan.cpp
+++ b/tools/qmlviewer/deviceorientation_harmattan.cpp
@@ -43,13 +43,13 @@
#include <QtDBus>
#include <QDebug>
-#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;
}