Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (21 commits)
  Autotest: make at least one update before checking if more are needed
  Fix warning about id maybe used when uninitialised
  Doc: setSslConfiguration also sets the CA certificates
  Autotest: check that the type received is the expected one
  Attempt to fix symbian 3.1 and 3.2 compile break.
  Prevents crashing when ICO file has bad color table value
  directfb: fix crash in client/server mode of qws
  Make Qt/DirectFB less verbose about failing to load pixmaps.
  Autotest: don't use the deprecated signal from QDBusConnectionInterface
  Autotest: be nicer to the subprocess and SIGTERM it
  Fix warnings in QtDeclarative
  Autotest: avoid memory leaks if test fails
  QtDBus: Make sure we can receive unknown types
  QtDBus meta object: keep methods, signals and props with unknown types
  Autotest: add a new test for parsing an introspection with unknown types
  Make the QtDBus parser not complain about unknown things
  fix-layer-getsurface-result-check-for-screen-size-determination
  Bump QtWebKit version to 2.0.2
  SSL: fix memory leak when loading certificates on Mac OS X
  Add a mutex to protect the access to the QSet.
  ...

1 files changed, 7 insertions, 3 deletions

diff --git a/tools/qml/qml.pri b/tools/qml/qml.pri
index 08cd506..650de94 100644
--- a/tools/qml/qml.pri
+++ b/tools/qml/qml.pri
@@ -19,17 +19,21 @@ SOURCES += $$PWD/qmlruntime.cpp \
 RESOURCES = $$PWD/browser/browser.qrc \
             $$PWD/startup/startup.qrc
 
-symbian: {
-    contains(QT_CONFIG, s60): {
+symbian {
+    contains(QT_CONFIG, s60) {
         LIBS += -lavkon -lcone
     }
     !contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) {
         LIBS += -lsensrvclient -lsensrvutil
     }
-    !contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2): {
+    !contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) {
         SOURCES += $$PWD/deviceorientation_symbian.cpp
         FORMS = $$PWD/recopts.ui \
                      $$PWD/proxysettings.ui
+    } else {
+        SOURCES += $$PWD/deviceorientation.cpp
+        FORMS = $$PWD/recopts.ui \
+                $$PWD/proxysettings.ui
     }
 } else:maemo5 {
     QT += dbus