ubuntu-touch-coreapps-reviewers team mailing list archive

[Michael Zanetti <michael.zanetti@xxxxxxxxxxxxx>]

Michael Zanetti has proposed merging lp:~mzanetti/reminders-app/align-imports into lp:reminders-app.

Commit message:
align all sdk imports to 1.3

Requested reviews:
  Ubuntu Notes app developers (notes-app-dev)

For more details, see:
https://code.launchpad.net/~mzanetti/reminders-app/align-imports/+merge/271139
-- 
Your team Ubuntu Notes app developers is requested to review the proposed merge of lp:~mzanetti/reminders-app/align-imports into lp:reminders-app.

=== modified file 'src/app/qml/components/BouncingProgressBar.qml'
--- src/app/qml/components/BouncingProgressBar.qml	2015-07-25 01:52:22 +0000
+++ src/app/qml/components/BouncingProgressBar.qml	2015-09-15 14:51:49 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 
 Item {

=== modified file 'src/app/qml/components/ConflictDelegate.qml'
--- src/app/qml/components/ConflictDelegate.qml	2015-07-25 01:52:22 +0000
+++ src/app/qml/components/ConflictDelegate.qml	2015-09-15 14:51:49 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
+import QtQuick 2.4
 import QtQuick.Layouts 1.1
 import Ubuntu.Components 1.3
 import Evernote 0.1

=== modified file 'src/app/qml/components/EditTagsDialog.qml'
--- src/app/qml/components/EditTagsDialog.qml	2015-09-11 09:31:39 +0000
+++ src/app/qml/components/EditTagsDialog.qml	2015-09-15 14:51:49 +0000
@@ -16,11 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import QtQuick.Layouts 1.1
 import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 1.0
-import Ubuntu.Components.ListItems 1.0
+import Ubuntu.Components.Popups 1.3
+import Ubuntu.Components.ListItems 1.3
 import Evernote 0.1
 
 Dialog {

=== modified file 'src/app/qml/components/ListItemWithActions.qml'
--- src/app/qml/components/ListItemWithActions.qml	2015-07-25 01:52:22 +0000
+++ src/app/qml/components/ListItemWithActions.qml	2015-09-15 14:51:49 +0000
@@ -14,10 +14,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import QtFeedback 5.0
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 Item {
     id: root

=== modified file 'src/app/qml/components/ListItemWithActionsCheckBox.qml'
--- src/app/qml/components/ListItemWithActionsCheckBox.qml	2015-07-25 01:52:22 +0000
+++ src/app/qml/components/ListItemWithActionsCheckBox.qml	2015-09-15 14:51:49 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 import "../Theme"
 

=== modified file 'src/app/qml/components/NoteHeader.qml'
--- src/app/qml/components/NoteHeader.qml	2015-09-10 22:59:41 +0000
+++ src/app/qml/components/NoteHeader.qml	2015-09-15 14:51:49 +0000
@@ -1,8 +1,8 @@
-import QtQuick 2.2
+import QtQuick 2.4
 import QtQuick.Layouts 1.1
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.0
-import Ubuntu.Components.Themes.Ambiance 1.1
+import Ubuntu.Components.ListItems 1.3
+import Ubuntu.Components.Themes.Ambiance 1.3
 import Evernote 0.1
 
 

=== modified file 'src/app/qml/components/NotebooksDelegate.qml'
--- src/app/qml/components/NotebooksDelegate.qml	2015-07-25 01:52:22 +0000
+++ src/app/qml/components/NotebooksDelegate.qml	2015-09-15 14:51:49 +0000
@@ -16,10 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import QtQuick.Layouts 1.0
+import QtQuick 2.4
+import QtQuick.Layouts 1.1
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.0
+import Ubuntu.Components.ListItems 1.3
 import Evernote 0.1
 
 ListItemWithActions {

=== modified file 'src/app/qml/components/NotesDelegate.qml'
--- src/app/qml/components/NotesDelegate.qml	2015-08-11 17:25:29 +0000
+++ src/app/qml/components/NotesDelegate.qml	2015-09-15 14:51:49 +0000
@@ -16,10 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import QtQuick.Layouts 1.0
+import QtQuick 2.4
+import QtQuick.Layouts 1.1
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.0
+import Ubuntu.Components.ListItems 1.3
 import Evernote 0.1
 
 ListItemWithActions {

=== modified file 'src/app/qml/components/PageWithBottomEdge.qml'
--- src/app/qml/components/PageWithBottomEdge.qml	2015-07-25 01:52:22 +0000
+++ src/app/qml/components/PageWithBottomEdge.qml	2015-09-15 14:51:49 +0000
@@ -62,7 +62,7 @@
 
 */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Evernote 0.1
 

=== modified file 'src/app/qml/components/PulldownListView.qml'
--- src/app/qml/components/PulldownListView.qml	2015-07-25 01:52:22 +0000
+++ src/app/qml/components/PulldownListView.qml	2015-09-15 14:51:49 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 
 ListView {

=== modified file 'src/app/qml/components/RemindersDelegate.qml'
--- src/app/qml/components/RemindersDelegate.qml	2015-09-10 21:17:04 +0000
+++ src/app/qml/components/RemindersDelegate.qml	2015-09-15 14:51:49 +0000
@@ -16,12 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import QtQuick.Layouts 1.0
+import QtQuick 2.4
+import QtQuick.Layouts 1.1
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.0
-import Ubuntu.Components.Popups 1.0
-import Ubuntu.Components.Pickers 1.0
+import Ubuntu.Components.ListItems 1.3
+import Ubuntu.Components.Popups 1.3
+import Ubuntu.Components.Pickers 1.3
 import Evernote 0.1
 
 ListItemWithActions {

=== modified file 'src/app/qml/components/ResolveConflictConfirmationDialog.qml'
--- src/app/qml/components/ResolveConflictConfirmationDialog.qml	2015-07-25 01:52:22 +0000
+++ src/app/qml/components/ResolveConflictConfirmationDialog.qml	2015-09-15 14:51:49 +0000
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
+import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components.Popups 1.3
 
 Dialog {
     id: root

=== modified file 'src/app/qml/components/RtfButton.qml'
--- src/app/qml/components/RtfButton.qml	2015-07-25 01:52:22 +0000
+++ src/app/qml/components/RtfButton.qml	2015-09-15 14:51:49 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import QtQuick.Layouts 1.1
 import Ubuntu.Components 1.3
 

=== modified file 'src/app/qml/components/RtfSeparator.qml'
--- src/app/qml/components/RtfSeparator.qml	2014-11-10 00:54:16 +0000
+++ src/app/qml/components/RtfSeparator.qml	2015-09-15 14:51:49 +0000
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import Ubuntu.Components.ListItems 1.0
+import QtQuick 2.4
+import Ubuntu.Components.ListItems 1.3
 
 Item {
     width: units.dp(1)

=== modified file 'src/app/qml/components/SortingDialog.qml'
--- src/app/qml/components/SortingDialog.qml	2015-07-25 01:52:22 +0000
+++ src/app/qml/components/SortingDialog.qml	2015-09-15 14:51:49 +0000
@@ -1,7 +1,7 @@
-import QtQuick 2.2
+import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 1.0
-import Ubuntu.Components.ListItems 1.0
+import Ubuntu.Components.Popups 1.3
+import Ubuntu.Components.ListItems 1.3
 import reminders 1.0
 
 Item {

=== modified file 'src/app/qml/components/StatusBar.qml'
--- src/app/qml/components/StatusBar.qml	2015-07-25 01:52:22 +0000
+++ src/app/qml/components/StatusBar.qml	2015-09-15 14:51:49 +0000
@@ -1,4 +1,4 @@
-import QtQuick 2.3
+import QtQuick 2.4
 import QtQuick.Layouts 1.1
 import Ubuntu.Components 1.3
 import Evernote 0.1

=== modified file 'src/app/qml/components/TagsDelegate.qml'
--- src/app/qml/components/TagsDelegate.qml	2015-07-25 01:52:22 +0000
+++ src/app/qml/components/TagsDelegate.qml	2015-09-15 14:51:49 +0000
@@ -16,10 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import QtQuick.Layouts 1.0
+import QtQuick 2.4
+import QtQuick.Layouts 1.1
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.0
+import Ubuntu.Components.ListItems 1.3
 import Evernote 0.1
 
 ListItemWithActions {

=== modified file 'src/app/qml/components/ToolbarSpacer.qml'
--- src/app/qml/components/ToolbarSpacer.qml	2015-07-25 01:52:22 +0000
+++ src/app/qml/components/ToolbarSpacer.qml	2015-09-15 14:51:49 +0000
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components.Popups 1.3
 
 Item {
     id: spacerItem

=== modified file 'src/app/qml/reminders.qml'
--- src/app/qml/reminders.qml	2015-09-10 22:59:41 +0000
+++ src/app/qml/reminders.qml	2015-09-15 14:51:49 +0000
@@ -16,11 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import QtQuick.Layouts 1.1
 import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 1.0
-import Ubuntu.Components.ListItems 1.0
+import Ubuntu.Components.Popups 1.3
+import Ubuntu.Components.ListItems 1.3
 import Ubuntu.Connectivity 1.0
 import Evernote 0.1
 import Ubuntu.OnlineAccounts 0.1

=== modified file 'src/app/qml/ui/AccountSelectorPage.qml'
--- src/app/qml/ui/AccountSelectorPage.qml	2015-07-25 01:52:22 +0000
+++ src/app/qml/ui/AccountSelectorPage.qml	2015-09-15 14:51:49 +0000
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.0
+import Ubuntu.Components.ListItems 1.3
 import Ubuntu.OnlineAccounts 0.1
 import Ubuntu.OnlineAccounts.Client 0.1
 import Evernote 0.1

=== modified file 'src/app/qml/ui/EditNotePage.qml'
--- src/app/qml/ui/EditNotePage.qml	2015-09-10 21:52:48 +0000
+++ src/app/qml/ui/EditNotePage.qml	2015-09-15 14:51:49 +0000
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.0
+import Ubuntu.Components.ListItems 1.3
 import Evernote 0.1
 import "../components"
 

=== modified file 'src/app/qml/ui/EditNoteView.qml'
--- src/app/qml/ui/EditNoteView.qml	2015-09-10 22:59:41 +0000
+++ src/app/qml/ui/EditNoteView.qml	2015-09-15 14:51:49 +0000
@@ -16,13 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import QtQuick.Layouts 1.1
 import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 1.0
-import Ubuntu.Components.ListItems 1.0
+import Ubuntu.Components.Popups 1.3
+import Ubuntu.Components.ListItems 1.3
 import Ubuntu.Content 0.1
-import Ubuntu.Components.Themes.Ambiance 1.1
+import Ubuntu.Components.Themes.Ambiance 1.3
 import Evernote 0.1
 import reminders 1.0
 import "../components"

=== modified file 'src/app/qml/ui/NoteConflictPage.qml'
--- src/app/qml/ui/NoteConflictPage.qml	2015-07-25 01:52:22 +0000
+++ src/app/qml/ui/NoteConflictPage.qml	2015-09-15 14:51:49 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Evernote 0.1
 import "../components"

=== modified file 'src/app/qml/ui/NoteConflictView.qml'
--- src/app/qml/ui/NoteConflictView.qml	2015-07-25 01:52:22 +0000
+++ src/app/qml/ui/NoteConflictView.qml	2015-09-15 14:51:49 +0000
@@ -16,9 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.0
+import Ubuntu.Components.ListItems 1.3
 import QtQuick.Layouts 1.1
 import Evernote 0.1
 import "../components"

=== modified file 'src/app/qml/ui/NotePage.qml'
--- src/app/qml/ui/NotePage.qml	2015-07-25 01:52:22 +0000
+++ src/app/qml/ui/NotePage.qml	2015-09-15 14:51:49 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Evernote 0.1
 import "../components"

=== modified file 'src/app/qml/ui/NoteView.qml'
--- src/app/qml/ui/NoteView.qml	2015-09-10 20:58:16 +0000
+++ src/app/qml/ui/NoteView.qml	2015-09-15 14:51:49 +0000
@@ -16,11 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import QtQuick.Layouts 1.1
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.0
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components.ListItems 1.3
+import Ubuntu.Components.Popups 1.3
 import com.canonical.Oxide 1.5
 import Ubuntu.Content 1.0
 import Evernote 0.1

=== modified file 'src/app/qml/ui/NotebooksPage.qml'
--- src/app/qml/ui/NotebooksPage.qml	2015-09-11 09:31:39 +0000
+++ src/app/qml/ui/NotebooksPage.qml	2015-09-15 14:51:49 +0000
@@ -16,10 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.0
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components.ListItems 1.3
+import Ubuntu.Components.Popups 1.3
 import Evernote 0.1
 import "../components"
 

=== modified file 'src/app/qml/ui/NotesPage.qml'
--- src/app/qml/ui/NotesPage.qml	2015-09-10 21:52:48 +0000
+++ src/app/qml/ui/NotesPage.qml	2015-09-15 14:51:49 +0000
@@ -16,11 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import QtQuick.Layouts 1.0
+import QtQuick 2.4
+import QtQuick.Layouts 1.1
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.0
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components.ListItems 1.3
+import Ubuntu.Components.Popups 1.3
 import Evernote 0.1
 import "../components"
 import Qt.labs.settings 1.0

=== modified file 'src/app/qml/ui/RemindersPage.qml'
--- src/app/qml/ui/RemindersPage.qml	2015-07-25 01:52:22 +0000
+++ src/app/qml/ui/RemindersPage.qml	2015-09-15 14:51:49 +0000
@@ -16,10 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import QtQuick.Layouts 1.0
+import QtQuick 2.4
+import QtQuick.Layouts 1.1
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.0
+import Ubuntu.Components.ListItems 1.3
 import Evernote 0.1
 import "../components"
 

=== modified file 'src/app/qml/ui/SearchNotesPage.qml'
--- src/app/qml/ui/SearchNotesPage.qml	2015-07-25 01:52:22 +0000
+++ src/app/qml/ui/SearchNotesPage.qml	2015-09-15 14:51:49 +0000
@@ -16,10 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.0
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components.ListItems 1.3
+import Ubuntu.Components.Popups 1.3
 import Evernote 0.1
 import "../components"
 

=== modified file 'src/app/qml/ui/SetReminderPage.qml'
--- src/app/qml/ui/SetReminderPage.qml	2015-07-25 01:52:22 +0000
+++ src/app/qml/ui/SetReminderPage.qml	2015-09-15 14:51:49 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Evernote 0.1
 import "../components"

=== modified file 'src/app/qml/ui/SetReminderView.qml'
--- src/app/qml/ui/SetReminderView.qml	2015-07-25 01:52:22 +0000
+++ src/app/qml/ui/SetReminderView.qml	2015-09-15 14:51:49 +0000
@@ -16,10 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
-import QtQuick.Layouts 1.0
+import QtQuick 2.4
+import QtQuick.Layouts 1.1
 import Ubuntu.Components 1.3
-import Ubuntu.Components.Pickers 1.0
+import Ubuntu.Components.Pickers 1.3
 import Evernote 0.1
 import "../components"
 

=== modified file 'src/app/qml/ui/TagsPage.qml'
--- src/app/qml/ui/TagsPage.qml	2015-07-25 01:52:22 +0000
+++ src/app/qml/ui/TagsPage.qml	2015-09-15 14:51:49 +0000
@@ -16,10 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.3
+import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.0
-import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components.ListItems 1.3
+import Ubuntu.Components.Popups 1.3
 import Evernote 0.1
 import "../components"