1
=== modified file 'rc/qml/GalleryApplication.qml'
2
--- rc/qml/GalleryApplication.qml	2013-05-22 18:35:58 +0000
3
+++ rc/qml/GalleryApplication.qml	2013-05-24 07:23:28 +0000
4
@@ -35,6 +35,8 @@
5
35
    */
35
    */
6
36
    property bool isPortrait: (height > width)
36
    property bool isPortrait: (height > width)
7
37
37
8
38
    property bool automaticOrientation: true
9
39
10
38
    // Big list of form factor-specific values.  'default' is used if the key
40
    // Big list of form factor-specific values.  'default' is used if the key
11
39
    // can't be found under any other form_factor (otherwise, form_factors should
41
    // can't be found under any other form_factor (otherwise, form_factors should
12
40
    // match the FORM_FACTOR values passed from main.cpp).  Just add Portrait to
42
    // match the FORM_FACTOR values passed from main.cpp).  Just add Portrait to
13
41
43
14
=== modified file 'rc/qml/MainScreen.qml'
15
--- rc/qml/MainScreen.qml	2013-05-22 17:29:50 +0000
16
+++ rc/qml/MainScreen.qml	2013-05-24 07:23:28 +0000
17
@@ -31,6 +31,7 @@
18
31
31
19
32
    anchors.fill: parent
32
    anchors.fill: parent
20
33
    applicationName: "gallery-app"
33
    applicationName: "gallery-app"
21
34
    automaticOrientation: application.automaticOrientation
22
34
35
23
35
    Tabs {
36
    Tabs {
24
36
        id: tabs
37
        id: tabs
Status:	Merged
Approved by:	Olivier Tilloy on 2013-05-24
Approved revision:	670
Merged at revision:	673
Proposed branch:	lp:~schwann/gallery-app/gallery-orientation-suppot
Merge into:	lp:gallery-app
Diff against target:	24 lines (+3/-0) 2 files modified rc/qml/GalleryApplication.qml (+2/-0) rc/qml/MainScreen.qml (+1/-0)
To merge this branch:	bzr merge lp:~schwann/gallery-app/gallery-orientation-suppot
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Olivier Tilloy		2013-05-17	Approve on 2013-05-24
PS Jenkins bot	continuous-integration		Approve on 2013-05-24
Review via email: mp+164314@code.launchpad.net