Get rid of harmattan PageStack and Page

They both drag in ToolBar.qml and its style which are not used anywhere.

diff --git a/qml/harmattan/CameraPage.qml b/qml/harmattan/CameraPage.qml
index 9a4d638..a60e054 100644 (file)
--- a/qml/harmattan/CameraPage.qml
+++ b/qml/harmattan/CameraPage.qml
@@ -21,9 +21,7 @@
  */
 
 import QtQuick 1.1
-import com.nokia.meego 1.1
 
-Page {
+Item {
     anchors.fill: parent
-    orientationLock: PageOrientation.LockLandscape
 }

diff --git a/qml/harmattan/CameraWindow.qml b/qml/harmattan/CameraWindow.qml
index 70753bc..77c0578 100644 (file)
--- a/qml/harmattan/CameraWindow.qml
+++ b/qml/harmattan/CameraWindow.qml
@@ -23,21 +23,19 @@
 import QtQuick 1.1
 import com.nokia.meego 1.1
 
-// PageStackWindow has the ugly toolbar which is always visible
-// upon startup no matter what I do.
-
 Window {
+    id: window
     property Component initialPage
+    property Item page
 
-    PageStack {
-        id: stack
-    }
-
+    Component.onDestruction: page.destroy()
     Component.onCompleted: {
+        screen.setAllowedOrientations(Screen.Landscape)
         theme.inverted = true
 
         if (initialPage) {
-            stack.push(initialPage)
+            page = initialPage.createObject(window)
+            page.visible = true
         }
     }
 }