diff options
| author |  Sebastian Kügler <sebas@kde.org> | 2016-01-06 04:44:26 +0100 |
|---|---|---|
| committer | Sebastian Kügler <sebas@kde.org> | 2016-01-06 04:44:26 +0100 |
| commit | 5d9881b8e1b435b2d2db96d195cdb8cf3c221a84 (patch) | |
| tree | e795fd5f751a3de872e26597d3c4a7dad85a36ee | |
| parent | 548d6fc956061cd1edb177447cdf07104d92b9c7 (diff) | |
| download | subsurface-5d9881b8e1b435b2d2db96d195cdb8cf3c221a84.tar.gz | |
adjustments needed for latest mobilecomponents
- flickable is gone, Page now just takes the children items, meaning we
can remove this assignment
- BasicListItem is factored out, and we now need it in our qrc
Signed-off-by: Sebastian Kügler <sebas@kde.org>
| -rw-r--r-- | qt-mobile/qml/DiveDetails.qml | 1 | ||||
| -rw-r--r-- | qt-mobile/qml/DiveList.qml | 1 | ||||
| -rw-r--r-- | qt-mobile/qml/Log.qml | 2 | ||||
| -rw-r--r-- | qt-mobile/qml/mobile-resources.qrc | 1 |
4 files changed, 2 insertions, 3 deletions
diff --git a/qt-mobile/qml/DiveDetails.qml b/qt-mobile/qml/DiveDetails.qml index 52fadd33c..a99aa628c 100644 --- a/qt-mobile/qml/DiveDetails.qml +++ b/qt-mobile/qml/DiveDetails.qml @@ -10,7 +10,6 @@ MobileComponents.Page { id: diveDetailsWindow width: parent.width objectName: "DiveDetails" - flickable: flick property string location property string gps diff --git a/qt-mobile/qml/DiveList.qml b/qt-mobile/qml/DiveList.qml index 6c2d6aa90..6d8f4924c 100644 --- a/qt-mobile/qml/DiveList.qml +++ b/qt-mobile/qml/DiveList.qml @@ -10,7 +10,6 @@ MobileComponents.Page { id: page objectName: "DiveList" color: MobileComponents.Theme.viewBackgroundColor - flickable: diveListView Component { id: diveDelegate diff --git a/qt-mobile/qml/Log.qml b/qt-mobile/qml/Log.qml index f77bf2fa9..bf3dcbdb0 100644 --- a/qt-mobile/qml/Log.qml +++ b/qt-mobile/qml/Log.qml @@ -13,7 +13,7 @@ MobileComponents.Page { width: parent.width - MobileComponents.Units.gridUnit anchors.margins: MobileComponents.Units.gridUnit / 2 objectName: "Log" - flickable: logFlick + ScrollView { anchors.fill: parent Flickable { diff --git a/qt-mobile/qml/mobile-resources.qrc b/qt-mobile/qml/mobile-resources.qrc index 8d799f09f..effb112f0 100644 --- a/qt-mobile/qml/mobile-resources.qrc +++ b/qt-mobile/qml/mobile-resources.qrc @@ -22,6 +22,7 @@ <file alias="org/kde/plasma/mobilecomponents/qmldir">mobilecomponents/qmldir</file> <file alias="org/kde/plasma/mobilecomponents/ActionGroup.qml">mobilecomponents/ActionGroup.qml</file> <file alias="org/kde/plasma/mobilecomponents/ApplicationWindow.qml">mobilecomponents/ApplicationWindow.qml</file> + <file alias="org/kde/plasma/mobilecomponents/BasicListItem.qml">mobilecomponents/BasicListItem.qml</file> <file alias="org/kde/plasma/mobilecomponents/GlobalDrawer.qml">mobilecomponents/GlobalDrawer.qml</file> <file alias="org/kde/plasma/mobilecomponents/ContextDrawer.qml">mobilecomponents/ContextDrawer.qml</file> <file alias="org/kde/plasma/mobilecomponents/Page.qml">mobilecomponents/Page.qml</file> |