From 15ebe8a375542826278aac2b920f0e3dac3ffaea Mon Sep 17 00:00:00 2001
From: Joona Petrell <joona.t.petrell@nokia.com>
Date: Mon, 21 Feb 2011 14:41:38 +1000
Subject: Another stab at fixing compilation on old Symbian platforms

Task-number: QTBUG-17472
Reviewed-by: Martin Jones
---
 tools/qml/qml.pri        | 6 ++----
 tools/qml/qmlruntime.cpp | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/tools/qml/qml.pri b/tools/qml/qml.pri
index 08cd506..5397384 100644
--- a/tools/qml/qml.pri
+++ b/tools/qml/qml.pri
@@ -25,12 +25,10 @@ symbian: {
     }
     !contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) {
         LIBS += -lsensrvclient -lsensrvutil
-    }
-    !contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2): {
         SOURCES += $$PWD/deviceorientation_symbian.cpp
-        FORMS = $$PWD/recopts.ui \
-                     $$PWD/proxysettings.ui
     }
+    FORMS += $$PWD/recopts.ui \
+             $$PWD/proxysettings.ui
 } else:maemo5 {
     QT += dbus
     HEADERS += $$PWD/texteditautoresizer_maemo5.h
diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp
index c746d8e..36915d1 100644
--- a/tools/qml/qmlruntime.cpp
+++ b/tools/qml/qmlruntime.cpp
@@ -50,7 +50,7 @@
 #  include <QWidgetAction>
 #  include <QStringListModel>
 #  include "ui_recopts_maemo5.h"
-#elif !defined(__SERIES60_31__) && !defined(__S60_32__)
+#else
 #  include "ui_recopts.h"
 #endif
 
-- 
cgit v0.12