From f9b3c7b4b372e9dabd74ab998fd4f670208e5c0b Mon Sep 17 00:00:00 2001 From: dannygb Date: Sat, 17 Nov 2018 12:54:02 +0000 Subject: [PATCH] Updates QtQuick to 2.4 --- KeePit/qml/CreateDatabase.qml | 2 +- KeePit/qml/Entry.qml | 2 +- KeePit/qml/EntryModel.qml | 2 +- KeePit/qml/Importer.qml | 4 ++-- KeePit/qml/KeySelector.qml | 2 +- KeePit/qml/Main.qml | 2 +- KeePit/qml/PasswordInput.qml | 2 +- KeePit/tests/unit/tst_main.qml | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/KeePit/qml/CreateDatabase.qml b/KeePit/qml/CreateDatabase.qml index 29f6a5b..657284d 100644 --- a/KeePit/qml/CreateDatabase.qml +++ b/KeePit/qml/CreateDatabase.qml @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -import QtQuick 2.0 +import QtQuick 2.4 import Ubuntu.Components 1.3 import QtQuick.Layouts 1.1 diff --git a/KeePit/qml/Entry.qml b/KeePit/qml/Entry.qml index 3d72a52..800016b 100644 --- a/KeePit/qml/Entry.qml +++ b/KeePit/qml/Entry.qml @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -import QtQuick 2.0 +import QtQuick 2.4 import Ubuntu.Components 1.3 import Ubuntu.Components.Popups 1.3 import KeePass3 1.0 diff --git a/KeePit/qml/EntryModel.qml b/KeePit/qml/EntryModel.qml index 5c22a48..dbeb9e7 100644 --- a/KeePit/qml/EntryModel.qml +++ b/KeePit/qml/EntryModel.qml @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -import QtQuick 2.0 +import QtQuick 2.4 ListModel { //id: listModel diff --git a/KeePit/qml/Importer.qml b/KeePit/qml/Importer.qml index f7fbbe0..18062e5 100644 --- a/KeePit/qml/Importer.qml +++ b/KeePit/qml/Importer.qml @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -import QtQuick 2.0 +import QtQuick 2.4 import Ubuntu.Components 1.3 import Ubuntu.Components.Popups 1.3 import Ubuntu.Components.ListItems 1.3 @@ -112,8 +112,8 @@ Item { Page { id: importPage visible: false - title: i18n.tr(importer.headerText) header: PageHeader { + title: i18n.tr(importer.headerText) leadingActionBar.actions: [ Action { iconName: importing ? "preferences-system-updates-symbolic" : "back" diff --git a/KeePit/qml/KeySelector.qml b/KeePit/qml/KeySelector.qml index 6725d28..7811b55 100644 --- a/KeePit/qml/KeySelector.qml +++ b/KeePit/qml/KeySelector.qml @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -import QtQuick 2.0 +import QtQuick 2.4 import Ubuntu.Components 1.3 import Ubuntu.Components.ListItems 1.3 import Ubuntu.Components.ListItems 1.3 as ListItemImport diff --git a/KeePit/qml/Main.qml b/KeePit/qml/Main.qml index 4432979..9f47305 100644 --- a/KeePit/qml/Main.qml +++ b/KeePit/qml/Main.qml @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -import QtQuick 2.0 +import QtQuick 2.4 import Ubuntu.Components 1.3 import Ubuntu.Components.Popups 1.3 import KeePass3 1.0 diff --git a/KeePit/qml/PasswordInput.qml b/KeePit/qml/PasswordInput.qml index 665b498..5a21be8 100644 --- a/KeePit/qml/PasswordInput.qml +++ b/KeePit/qml/PasswordInput.qml @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -import QtQuick 2.0 +import QtQuick 2.4 import Ubuntu.Components 1.3 import Ubuntu.Components.ListItems 1.3 import Ubuntu.Components.Popups 1.3 diff --git a/KeePit/tests/unit/tst_main.qml b/KeePit/tests/unit/tst_main.qml index ad29a7d..25fcc8f 100644 --- a/KeePit/tests/unit/tst_main.qml +++ b/KeePit/tests/unit/tst_main.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.4 import QtTest 1.0 import Ubuntu.Test 1.0 import "../../"