camera-app

Merge lp:~fboucault/camera-app/toolkit13 into lp:camera-app

  1. toolkit13
  2. Merge into trunk
Proposed by Florian Boucault
Status: Merged
Approved by: Florian Boucault
Approved revision: 591
Merged at revision: 586
Proposed branch: lp:~fboucault/camera-app/toolkit13
Merge into: lp:camera-app
Diff against target: 518 lines (+71/-71)
31 files modified
BottomEdgeIndicators.qml (+2/-2)
CircleButton.qml (+3/-3)
DeleteDialog.qml (+3/-3)
FocusRing.qml (+2/-2)
GalleryView.qml (+2/-2)
GalleryViewHeader.qml (+5/-5)
GalleryViewLoader.qml (+1/-1)
IconButton.qml (+2/-2)
NoSpaceHint.qml (+2/-2)
OptionButton.qml (+1/-1)
OptionValueButton.qml (+2/-2)
OptionsOverlay.qml (+2/-2)
PhotoEditorLoader.qml (+1/-1)
PhotoRollHint.qml (+2/-2)
PhotogridView.qml (+3/-3)
SharePopover.qml (+4/-4)
ShootButton.qml (+2/-2)
SlideshowView.qml (+5/-5)
Snapshot.qml (+3/-3)
StopWatch.qml (+3/-3)
ThinSliderStyle.qml (+2/-2)
ViewFinderExportConfirmation.qml (+2/-2)
ViewFinderGeometry.qml (+1/-1)
ViewFinderOverlay.qml (+4/-4)
ViewFinderOverlayLoader.qml (+1/-1)
ViewFinderView.qml (+3/-3)
ZoomControl.qml (+2/-2)
camera-app.qml (+3/-3)
tests/unittests/tst_BottomEdgeIndicators.qml (+1/-1)
tests/unittests/tst_StopWatch.qml (+1/-1)
tests/unittests/tst_ViewFinderGeometry.qml (+1/-1)
To merge this branch: bzr merge lp:~fboucault/camera-app/toolkit13
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+275325@code.launchpad.net

Commit message

Migrated to using Ubuntu UI Toolkit version 1.3 only.
Migrated to using QtQuick 2.4 and QtQuick.Window 2.2 only.

To post a comment you must log in.
lp:~fboucault/camera-app/toolkit13 updated
587. By Florian Boucault

Switched to QtQuick 2.4 and QtQuick.Window 2.2

588. By Florian Boucault

Switched to QtQuick 2.4 and QtQuick.Window 2.2

589. By Florian Boucault

Switched to QtQuick 2.4 and QtQuick.Window 2.2

590. By Florian Boucault

Tag bug

591. By Florian Boucault

Fixed used of Theme

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:586
http://jenkins.qa.ubuntu.com/job/camera-app-ci/438/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/134/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/134/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/134/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/279
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/933
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/760
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24469

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/438/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:591
http://jenkins.qa.ubuntu.com/job/camera-app-ci/439/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/135/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/135/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/135/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/280
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/934
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/761
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24479

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/439/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Florian Boucault (fboucault) wrote :

AP tests still pass.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'BottomEdgeIndicators.qml'
--- BottomEdgeIndicators.qml 2015-03-11 20:03:21 +0000
+++ BottomEdgeIndicators.qml 2015-10-22 12:46:40 +0000
@@ -14,8 +14,8 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.217import QtQuick 2.4
18import Ubuntu.Components 1.118import Ubuntu.Components 1.3
1919
20Item {20Item {
21 id: bottomEdgeIndicators21 id: bottomEdgeIndicators
2222
=== modified file 'CircleButton.qml'
--- CircleButton.qml 2015-07-03 10:32:14 +0000
+++ CircleButton.qml 2015-10-22 12:46:40 +0000
@@ -14,9 +14,9 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.217import QtQuick 2.4
18import QtQuick.Window 2.018import QtQuick.Window 2.2
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
2020
21AbstractButton {21AbstractButton {
22 id: button22 id: button
2323
=== modified file 'DeleteDialog.qml'
--- DeleteDialog.qml 2014-11-20 22:02:12 +0000
+++ DeleteDialog.qml 2015-10-22 12:46:40 +0000
@@ -14,9 +14,9 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.217import QtQuick 2.4
18import Ubuntu.Components 1.018import Ubuntu.Components 1.3
19import Ubuntu.Components.Popups 1.019import Ubuntu.Components.Popups 1.3
2020
21Dialog {21Dialog {
22 signal deleteFiles()22 signal deleteFiles()
2323
=== modified file 'FocusRing.qml'
--- FocusRing.qml 2014-08-26 23:46:49 +0000
+++ FocusRing.qml 2015-10-22 12:46:40 +0000
@@ -14,8 +14,8 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.217import QtQuick 2.4
18import Ubuntu.Components 1.018import Ubuntu.Components 1.3
1919
20Image {20Image {
21 id: focusRing21 id: focusRing
2222
=== modified file 'GalleryView.qml'
--- GalleryView.qml 2015-02-12 19:25:00 +0000
+++ GalleryView.qml 2015-10-22 12:46:40 +0000
@@ -14,8 +14,8 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.217import QtQuick 2.4
18import Ubuntu.Components 1.118import Ubuntu.Components 1.3
19import Ubuntu.Content 0.119import Ubuntu.Content 0.1
20import CameraApp 0.120import CameraApp 0.1
21import "MimeTypeMapper.js" as MimeTypeMapper21import "MimeTypeMapper.js" as MimeTypeMapper
2222
=== modified file 'GalleryViewHeader.qml'
--- GalleryViewHeader.qml 2015-06-10 12:42:46 +0000
+++ GalleryViewHeader.qml 2015-10-22 12:46:40 +0000
@@ -14,8 +14,8 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.217import QtQuick 2.4
18import Ubuntu.Components 1.018import Ubuntu.Components 1.3
19import QtQuick.Layouts 1.119import QtQuick.Layouts 1.1
2020
21Item {21Item {
@@ -70,7 +70,7 @@
70 }70 }
71 width: units.gu(8)71 width: units.gu(8)
72 iconName: "back"72 iconName: "back"
73 iconColor: Theme.palette.normal.foregroundText73 iconColor: theme.palette.normal.foregroundText
74 onClicked: editMode ? header.exitEditor() : header.exit()74 onClicked: editMode ? header.exitEditor() : header.exit()
75 }75 }
7676
@@ -78,7 +78,7 @@
78 text: main.contentExportMode || userSelectionMode ? i18n.tr("Select") :78 text: main.contentExportMode || userSelectionMode ? i18n.tr("Select") :
79 (editMode ? i18n.tr("Edit Photo") : i18n.tr("Photo Roll"))79 (editMode ? i18n.tr("Edit Photo") : i18n.tr("Photo Roll"))
80 fontSize: "x-large"80 fontSize: "x-large"
81 color: Theme.palette.normal.foregroundText81 color: theme.palette.normal.foregroundText
82 elide: Text.ElideRight82 elide: Text.ElideRight
83 Layout.fillWidth: true83 Layout.fillWidth: true
84 }84 }
@@ -225,7 +225,7 @@
225 }225 }
226 text: model.text226 text: model.text
227 elide: Text.ElideRight227 elide: Text.ElideRight
228 color: action.enabled ? Theme.palette.normal.foregroundText : Qt.darker(Theme.palette.normal.foregroundText, 2.0)228 color: action.enabled ? theme.palette.normal.foregroundText : Qt.darker(theme.palette.normal.foregroundText, 2.0)
229 }229 }
230230
231 Icon {231 Icon {
232232
=== modified file 'GalleryViewLoader.qml'
--- GalleryViewLoader.qml 2015-01-24 12:52:12 +0000
+++ GalleryViewLoader.qml 2015-10-22 12:46:40 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.217import QtQuick 2.4
1818
19Loader {19Loader {
20 id: loader20 id: loader
2121
=== modified file 'IconButton.qml'
--- IconButton.qml 2014-11-24 17:34:33 +0000
+++ IconButton.qml 2015-10-22 12:46:40 +0000
@@ -14,8 +14,8 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import Ubuntu.Components 1.018import Ubuntu.Components 1.3
1919
20AbstractButton {20AbstractButton {
21 id: button21 id: button
2222
=== modified file 'NoSpaceHint.qml'
--- NoSpaceHint.qml 2015-01-23 19:29:32 +0000
+++ NoSpaceHint.qml 2015-10-22 12:46:40 +0000
@@ -14,8 +14,8 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.217import QtQuick 2.4
18import Ubuntu.Components 1.118import Ubuntu.Components 1.3
1919
20Item {20Item {
21 id: noSpaceHint21 id: noSpaceHint
2222
=== modified file 'OptionButton.qml'
--- OptionButton.qml 2015-07-03 10:32:14 +0000
+++ OptionButton.qml 2015-10-22 12:46:40 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.217import QtQuick 2.4
1818
19CircleButton {19CircleButton {
20 id: optionButton20 id: optionButton
2121
=== modified file 'OptionValueButton.qml'
--- OptionValueButton.qml 2015-01-27 15:22:59 +0000
+++ OptionValueButton.qml 2015-10-22 12:46:40 +0000
@@ -14,8 +14,8 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import Ubuntu.Components 1.018import Ubuntu.Components 1.3
1919
20AbstractButton {20AbstractButton {
21 id: optionValueButton21 id: optionValueButton
2222
=== modified file 'OptionsOverlay.qml'
--- OptionsOverlay.qml 2015-07-03 10:32:14 +0000
+++ OptionsOverlay.qml 2015-10-22 12:46:40 +0000
@@ -14,8 +14,8 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.217import QtQuick 2.4
18import Ubuntu.Components 1.118import Ubuntu.Components 1.3
1919
20Item {20Item {
21 id: optionsOverlay21 id: optionsOverlay
2222
=== modified file 'PhotoEditorLoader.qml'
--- PhotoEditorLoader.qml 2015-02-11 15:14:12 +0000
+++ PhotoEditorLoader.qml 2015-10-22 12:46:40 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import Ubuntu.Components.Extras 0.218import Ubuntu.Components.Extras 0.2
1919
20PhotoEditor {20PhotoEditor {
2121
=== modified file 'PhotoRollHint.qml'
--- PhotoRollHint.qml 2015-07-03 10:32:14 +0000
+++ PhotoRollHint.qml 2015-10-22 12:46:40 +0000
@@ -14,8 +14,8 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.217import QtQuick 2.4
18import Ubuntu.Components 1.118import Ubuntu.Components 1.3
19import Qt.labs.settings 1.019import Qt.labs.settings 1.0
2020
21Item {21Item {
2222
=== modified file 'PhotogridView.qml'
--- PhotogridView.qml 2015-01-28 14:28:27 +0000
+++ PhotogridView.qml 2015-10-22 12:46:40 +0000
@@ -14,9 +14,9 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.217import QtQuick 2.4
18import Ubuntu.Components 1.018import Ubuntu.Components 1.3
19import Ubuntu.Components.Popups 1.019import Ubuntu.Components.Popups 1.3
20import Ubuntu.Thumbnailer 0.120import Ubuntu.Thumbnailer 0.1
21import Ubuntu.Content 0.121import Ubuntu.Content 0.1
22import CameraApp 0.122import CameraApp 0.1
2323
=== modified file 'SharePopover.qml'
--- SharePopover.qml 2014-11-12 18:41:54 +0000
+++ SharePopover.qml 2015-10-22 12:46:40 +0000
@@ -14,9 +14,9 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.217import QtQuick 2.4
18import Ubuntu.Components 1.018import Ubuntu.Components 1.3
19import Ubuntu.Components.Popups 1.019import Ubuntu.Components.Popups 1.3
20import Ubuntu.Content 0.120import Ubuntu.Content 0.1
2121
22PopupBase {22PopupBase {
@@ -34,7 +34,7 @@
34 // FIXME: ContentPeerPicker should either have a background or not, not half of one34 // FIXME: ContentPeerPicker should either have a background or not, not half of one
35 Rectangle {35 Rectangle {
36 anchors.fill: parent36 anchors.fill: parent
37 color: Theme.palette.normal.overlay37 color: theme.palette.normal.overlay
38 }38 }
3939
40 ContentPeerPicker {40 ContentPeerPicker {
4141
=== modified file 'ShootButton.qml'
--- ShootButton.qml 2014-08-27 00:09:02 +0000
+++ ShootButton.qml 2015-10-22 12:46:40 +0000
@@ -14,8 +14,8 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import Ubuntu.Components 1.018import Ubuntu.Components 1.3
1919
20Item {20Item {
21 id: shootButton21 id: shootButton
2222
=== modified file 'SlideshowView.qml'
--- SlideshowView.qml 2015-02-18 18:04:35 +0000
+++ SlideshowView.qml 2015-10-22 12:46:40 +0000
@@ -14,10 +14,10 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.217import QtQuick 2.4
18import Ubuntu.Components 1.018import Ubuntu.Components 1.3
19import Ubuntu.Components.ListItems 1.0 as ListItems19import Ubuntu.Components.ListItems 1.3 as ListItems
20import Ubuntu.Components.Popups 1.020import Ubuntu.Components.Popups 1.3
21import Ubuntu.Content 0.121import Ubuntu.Content 0.1
22import Ubuntu.Thumbnailer 0.122import Ubuntu.Thumbnailer 0.1
23import CameraApp 0.123import CameraApp 0.1
@@ -69,7 +69,7 @@
69 Component.onCompleted: {69 Component.onCompleted: {
70 // The PhotoEditor is only available in Ubuntu.Components.Extras 0.270 // The PhotoEditor is only available in Ubuntu.Components.Extras 0.2
71 // If we succeed here we add the edit button to the list of actions.71 // If we succeed here we add the edit button to the list of actions.
72 try { Qt.createQmlObject('import QtQuick 2.0; import Ubuntu.Components.Extras 0.2; Item {}', slideshowView) }72 try { Qt.createQmlObject('import QtQuick 2.4; import Ubuntu.Components.Extras 0.2; Item {}', slideshowView) }
73 catch (e) { return; }73 catch (e) { return; }
7474
75 editingAvailable = true;75 editingAvailable = true;
7676
=== modified file 'Snapshot.qml'
--- Snapshot.qml 2015-07-03 10:32:14 +0000
+++ Snapshot.qml 2015-10-22 12:46:40 +0000
@@ -14,9 +14,9 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.217import QtQuick 2.4
18import QtQuick.Window 2.018import QtQuick.Window 2.2
19import Ubuntu.Components 1.019import Ubuntu.Components 1.3
2020
21Item {21Item {
22 id: snapshotRoot22 id: snapshotRoot
2323
=== modified file 'StopWatch.qml'
--- StopWatch.qml 2014-12-09 11:32:51 +0000
+++ StopWatch.qml 2015-10-22 12:46:40 +0000
@@ -14,9 +14,9 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.217import QtQuick 2.4
18import QtQuick.Window 2.018import QtQuick.Window 2.2
19import Ubuntu.Components 1.019import Ubuntu.Components 1.3
2020
21Item {21Item {
22 property int time: 022 property int time: 0
2323
=== modified file 'ThinSliderStyle.qml'
--- ThinSliderStyle.qml 2014-08-26 23:46:49 +0000
+++ ThinSliderStyle.qml 2015-10-22 12:46:40 +0000
@@ -14,8 +14,8 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import Ubuntu.Components 1.018import Ubuntu.Components 1.3
1919
20/*20/*
21 This delegate is styled using the following properties:21 This delegate is styled using the following properties:
2222
=== modified file 'ViewFinderExportConfirmation.qml'
--- ViewFinderExportConfirmation.qml 2014-08-27 00:44:55 +0000
+++ ViewFinderExportConfirmation.qml 2015-10-22 12:46:40 +0000
@@ -14,8 +14,8 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.217import QtQuick 2.4
18import Ubuntu.Components 1.118import Ubuntu.Components 1.3
1919
20Item {20Item {
21 id: viewFinderExportConfirmation21 id: viewFinderExportConfirmation
2222
=== modified file 'ViewFinderGeometry.qml'
--- ViewFinderGeometry.qml 2013-02-07 13:13:23 +0000
+++ ViewFinderGeometry.qml 2015-10-22 12:46:40 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
1818
19Item {19Item {
20 property size cameraResolution;20 property size cameraResolution;
2121
=== modified file 'ViewFinderOverlay.qml'
--- ViewFinderOverlay.qml 2015-10-02 19:51:31 +0000
+++ ViewFinderOverlay.qml 2015-10-22 12:46:40 +0000
@@ -14,10 +14,10 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.217import QtQuick 2.4
18import QtQuick.Window 2.018import QtQuick.Window 2.2
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import Ubuntu.Components.Popups 1.020import Ubuntu.Components.Popups 1.3
21import QtMultimedia 5.021import QtMultimedia 5.0
22import QtPositioning 5.222import QtPositioning 5.2
23import QtSensors 5.023import QtSensors 5.0
2424
=== modified file 'ViewFinderOverlayLoader.qml'
--- ViewFinderOverlayLoader.qml 2014-12-05 18:57:32 +0000
+++ ViewFinderOverlayLoader.qml 2015-10-22 12:46:40 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.217import QtQuick 2.4
1818
19Loader {19Loader {
20 id: loader20 id: loader
2121
=== modified file 'ViewFinderView.qml'
--- ViewFinderView.qml 2015-07-03 11:03:42 +0000
+++ ViewFinderView.qml 2015-10-22 12:46:40 +0000
@@ -14,9 +14,9 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.217import QtQuick 2.4
18import QtQuick.Window 2.018import QtQuick.Window 2.2
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import QtMultimedia 5.020import QtMultimedia 5.0
21import CameraApp 0.121import CameraApp 0.1
22import QtGraphicalEffects 1.022import QtGraphicalEffects 1.0
2323
=== modified file 'ZoomControl.qml'
--- ZoomControl.qml 2014-08-26 23:46:49 +0000
+++ ZoomControl.qml 2015-10-22 12:46:40 +0000
@@ -14,8 +14,8 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.4
18import Ubuntu.Components 1.018import Ubuntu.Components 1.3
1919
20Item {20Item {
21 id: zoomControl21 id: zoomControl
2222
=== modified file 'camera-app.qml'
--- camera-app.qml 2015-07-03 10:32:14 +0000
+++ camera-app.qml 2015-10-22 12:46:40 +0000
@@ -14,10 +14,10 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.217import QtQuick 2.4
18import QtQuick.Window 2.018import QtQuick.Window 2.2
19import QtMultimedia 5.019import QtMultimedia 5.0
20import Ubuntu.Components 1.020import Ubuntu.Components 1.3
21import Ubuntu.Unity.Action 1.1 as UnityActions21import Ubuntu.Unity.Action 1.1 as UnityActions
22import UserMetrics 0.122import UserMetrics 0.1
23import Ubuntu.Content 0.123import Ubuntu.Content 0.1
2424
=== modified file 'tests/unittests/tst_BottomEdgeIndicators.qml'
--- tests/unittests/tst_BottomEdgeIndicators.qml 2015-03-27 14:42:16 +0000
+++ tests/unittests/tst_BottomEdgeIndicators.qml 2015-10-22 12:46:40 +0000
@@ -15,7 +15,7 @@
15 *15 *
16 */16 */
1717
18import QtQuick 2.018import QtQuick 2.4
19import QtTest 1.019import QtTest 1.0
20import "../../"20import "../../"
21import "../../.." //Needed for out of source build21import "../../.." //Needed for out of source build
2222
=== modified file 'tests/unittests/tst_StopWatch.qml'
--- tests/unittests/tst_StopWatch.qml 2014-12-09 11:23:38 +0000
+++ tests/unittests/tst_StopWatch.qml 2015-10-22 12:46:40 +0000
@@ -15,7 +15,7 @@
15 *15 *
16 */16 */
1717
18import QtQuick 2.018import QtQuick 2.4
19import QtTest 1.019import QtTest 1.0
20import "../../"20import "../../"
21import "../../.." //Needed for out of source build21import "../../.." //Needed for out of source build
2222
=== modified file 'tests/unittests/tst_ViewFinderGeometry.qml'
--- tests/unittests/tst_ViewFinderGeometry.qml 2013-02-07 13:13:23 +0000
+++ tests/unittests/tst_ViewFinderGeometry.qml 2015-10-22 12:46:40 +0000
@@ -15,7 +15,7 @@
15 *15 *
16 */16 */
1717
18import QtQuick 2.018import QtQuick 2.4
19import QtTest 1.019import QtTest 1.0
20import "../../"20import "../../"
21import "../../.." //Needed for out of source build21import "../../.." //Needed for out of source build

Subscribers

People subscribed via source and target branches