-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): {
         SOURCES += $$PWD/deviceorientation_symbian.cpp
         FORMS = $$PWD/recopts.ui \
                      $$PWD/proxysettings.ui
+    } else {
+    SOURCES += $$PWD/deviceorientation.cpp
+    FORMS = $$PWD/recopts.ui \
+            $$PWD/proxysettings.ui
     }