From 14b4c94ded4f82bc473b9e286e2dcb87d600b14a Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 21 Jan 2017 14:42:10 -0800 Subject: [PATCH] Revert "QML UI: build against latest Kirigami" This reverts commit a842e44b685dbb7e34df317a8beacff747cee6bd. --- CMakeLists.txt | 2 -- mobile-widgets/qml/About.qml | 2 +- mobile-widgets/qml/CloudCredentials.qml | 2 +- mobile-widgets/qml/DiveDetails.qml | 2 +- mobile-widgets/qml/DiveDetailsEdit.qml | 2 +- mobile-widgets/qml/DiveDetailsView.qml | 2 +- mobile-widgets/qml/DiveList.qml | 2 +- mobile-widgets/qml/DownloadFromDiveComputer.qml | 2 +- mobile-widgets/qml/GpsList.qml | 2 +- mobile-widgets/qml/Log.qml | 2 +- mobile-widgets/qml/Preferences.qml | 2 +- mobile-widgets/qml/StartPage.qml | 2 +- mobile-widgets/qml/SubsurfaceButton.qml | 2 +- mobile-widgets/qml/ThemeTest.qml | 2 +- mobile-widgets/qml/main.qml | 2 +- 15 files changed, 14 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 811480149..29fcd0bac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -239,8 +239,6 @@ if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileExecutable") mobile-widgets/qmlprofile.cpp mobile-widgets/qml/kirigami/src/kirigamiplugin.cpp mobile-widgets/qml/kirigami/src/enums.cpp - mobile-widgets/qml/kirigami/src/desktopicon.cpp - mobile-widgets/qml/kirigami/src/settings.cpp subsurface-mobile-main.cpp subsurface-mobile-helper.cpp ) diff --git a/mobile-widgets/qml/About.qml b/mobile-widgets/qml/About.qml index 113eac702..cf9ade9b6 100644 --- a/mobile-widgets/qml/About.qml +++ b/mobile-widgets/qml/About.qml @@ -1,7 +1,7 @@ import QtQuick 2.3 import QtQuick.Controls 1.2 import QtQuick.Layouts 1.1 -import org.kde.kirigami 2.0 as Kirigami +import org.kde.kirigami 1.0 as Kirigami import org.subsurfacedivelog.mobile 1.0 Kirigami.ScrollablePage { diff --git a/mobile-widgets/qml/CloudCredentials.qml b/mobile-widgets/qml/CloudCredentials.qml index 980e64c6d..7f1e0d986 100644 --- a/mobile-widgets/qml/CloudCredentials.qml +++ b/mobile-widgets/qml/CloudCredentials.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 1.2 import QtQuick.Window 2.2 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.1 -import org.kde.kirigami 2.0 as Kirigami +import org.kde.kirigami 1.0 as Kirigami import org.subsurfacedivelog.mobile 1.0 Item { diff --git a/mobile-widgets/qml/DiveDetails.qml b/mobile-widgets/qml/DiveDetails.qml index 96e8fd993..be342886d 100644 --- a/mobile-widgets/qml/DiveDetails.qml +++ b/mobile-widgets/qml/DiveDetails.qml @@ -4,7 +4,7 @@ import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.2 import org.subsurfacedivelog.mobile 1.0 -import org.kde.kirigami 2.0 as Kirigami +import org.kde.kirigami 1.0 as Kirigami Kirigami.Page { id: diveDetailsPage diff --git a/mobile-widgets/qml/DiveDetailsEdit.qml b/mobile-widgets/qml/DiveDetailsEdit.qml index 94b1baadd..6ab2978f0 100644 --- a/mobile-widgets/qml/DiveDetailsEdit.qml +++ b/mobile-widgets/qml/DiveDetailsEdit.qml @@ -4,7 +4,7 @@ import QtQuick.Controls.Styles 1.2 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.1 import org.subsurfacedivelog.mobile 1.0 -import org.kde.kirigami 2.0 as Kirigami +import org.kde.kirigami 1.0 as Kirigami Item { id: detailsEdit diff --git a/mobile-widgets/qml/DiveDetailsView.qml b/mobile-widgets/qml/DiveDetailsView.qml index 4afc7d4f0..fda0db9d0 100644 --- a/mobile-widgets/qml/DiveDetailsView.qml +++ b/mobile-widgets/qml/DiveDetailsView.qml @@ -7,7 +7,7 @@ import QtQuick.Controls.Styles 1.2 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.1 import org.subsurfacedivelog.mobile 1.0 -import org.kde.kirigami 2.0 as Kirigami +import org.kde.kirigami 1.0 as Kirigami Item { id: detailsView diff --git a/mobile-widgets/qml/DiveList.qml b/mobile-widgets/qml/DiveList.qml index 49753b8ae..cb94e79d1 100644 --- a/mobile-widgets/qml/DiveList.qml +++ b/mobile-widgets/qml/DiveList.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 1.2 import QtQuick.Layouts 1.2 import QtQuick.Window 2.2 import QtQuick.Dialogs 1.2 -import org.kde.kirigami 2.0 as Kirigami +import org.kde.kirigami 1.0 as Kirigami import org.subsurfacedivelog.mobile 1.0 Kirigami.ScrollablePage { diff --git a/mobile-widgets/qml/DownloadFromDiveComputer.qml b/mobile-widgets/qml/DownloadFromDiveComputer.qml index 151735298..85f043d47 100644 --- a/mobile-widgets/qml/DownloadFromDiveComputer.qml +++ b/mobile-widgets/qml/DownloadFromDiveComputer.qml @@ -5,7 +5,7 @@ import QtQuick.Window 2.2 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.1 import org.subsurfacedivelog.mobile 1.0 -import org.kde.kirigami 2.0 as Kirigami +import org.kde.kirigami 1.0 as Kirigami Kirigami.Page { id: diveComputerDownloadWindow diff --git a/mobile-widgets/qml/GpsList.qml b/mobile-widgets/qml/GpsList.qml index 411677f7f..47b1d4c77 100644 --- a/mobile-widgets/qml/GpsList.qml +++ b/mobile-widgets/qml/GpsList.qml @@ -6,7 +6,7 @@ import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.1 import QtQuick.Window 2.2 import org.subsurfacedivelog.mobile 1.0 -import org.kde.kirigami 2.0 as Kirigami +import org.kde.kirigami 1.0 as Kirigami Kirigami.ScrollablePage { id: gpsListWindow diff --git a/mobile-widgets/qml/Log.qml b/mobile-widgets/qml/Log.qml index cd4542422..7d630d0bf 100644 --- a/mobile-widgets/qml/Log.qml +++ b/mobile-widgets/qml/Log.qml @@ -6,7 +6,7 @@ import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.1 import QtQuick.Window 2.2 import org.subsurfacedivelog.mobile 1.0 -import org.kde.kirigami 2.0 as Kirigami +import org.kde.kirigami 1.0 as Kirigami Kirigami.ScrollablePage { id: logWindow diff --git a/mobile-widgets/qml/Preferences.qml b/mobile-widgets/qml/Preferences.qml index 17b9e2dae..c43734114 100644 --- a/mobile-widgets/qml/Preferences.qml +++ b/mobile-widgets/qml/Preferences.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 1.2 import QtQuick.Window 2.2 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.1 -import org.kde.kirigami 2.0 as Kirigami +import org.kde.kirigami 1.0 as Kirigami import org.subsurfacedivelog.mobile 1.0 Kirigami.Page { diff --git a/mobile-widgets/qml/StartPage.qml b/mobile-widgets/qml/StartPage.qml index f8ee614da..12a5d0103 100644 --- a/mobile-widgets/qml/StartPage.qml +++ b/mobile-widgets/qml/StartPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.5 import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.2 import QtQuick.Layouts 1.1 -import org.kde.kirigami 2.0 as Kirigami +import org.kde.kirigami 1.0 as Kirigami import org.subsurfacedivelog.mobile 1.0 ColumnLayout { diff --git a/mobile-widgets/qml/SubsurfaceButton.qml b/mobile-widgets/qml/SubsurfaceButton.qml index 0a10243fb..174d44659 100644 --- a/mobile-widgets/qml/SubsurfaceButton.qml +++ b/mobile-widgets/qml/SubsurfaceButton.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.2 -import org.kde.kirigami 2.0 as Kirigami +import org.kde.kirigami 1.0 as Kirigami Button { style: ButtonStyle { diff --git a/mobile-widgets/qml/ThemeTest.qml b/mobile-widgets/qml/ThemeTest.qml index 8684c1e42..8aae32a30 100644 --- a/mobile-widgets/qml/ThemeTest.qml +++ b/mobile-widgets/qml/ThemeTest.qml @@ -2,7 +2,7 @@ import QtQuick 2.5 import QtQuick.Controls 1.4 import QtQuick.Layouts 1.1 import QtQuick.Window 2.2 -import org.kde.kirigami 2.0 as Kirigami +import org.kde.kirigami 1.0 as Kirigami Kirigami.Page { diff --git a/mobile-widgets/qml/main.qml b/mobile-widgets/qml/main.qml index 753e1d4b0..62325b691 100644 --- a/mobile-widgets/qml/main.qml +++ b/mobile-widgets/qml/main.qml @@ -6,7 +6,7 @@ import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.1 import QtQuick.Window 2.2 import org.subsurfacedivelog.mobile 1.0 -import org.kde.kirigami 2.0 as Kirigami +import org.kde.kirigami 1.0 as Kirigami Kirigami.ApplicationWindow { id: rootItem