mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 05:00:20 +00:00
Revert "QML UI: build against latest Kirigami"
This reverts commit a842e44b68
.
This commit is contained in:
parent
6459e455bc
commit
14b4c94ded
15 changed files with 14 additions and 16 deletions
|
@ -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
|
||||
)
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue