Changeset 14b4c94 in subsurface


Ignore:
Timestamp:
Jan 21, 2017, 2:42:10 PM (5 months ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
affea80
Parents:
6459e45
Message:

Revert "QML UI: build against latest Kirigami"

This reverts commit a842e44b685dbb7e34df317a8beacff747cee6bd.

Files:
15 edited

Legend:

Unmodified
Added
Removed
  • CMakeLists.txt

    r73641c4e r14b4c94  
    240240                mobile-widgets/qml/kirigami/src/kirigamiplugin.cpp
    241241                mobile-widgets/qml/kirigami/src/enums.cpp
    242                 mobile-widgets/qml/kirigami/src/desktopicon.cpp
    243                 mobile-widgets/qml/kirigami/src/settings.cpp
    244242                subsurface-mobile-main.cpp
    245243                subsurface-mobile-helper.cpp
  • mobile-widgets/qml/About.qml

    rba23989 r14b4c94  
    22import QtQuick.Controls 1.2
    33import QtQuick.Layouts 1.1
    4 import org.kde.kirigami 2.0 as Kirigami
     4import org.kde.kirigami 1.0 as Kirigami
    55import org.subsurfacedivelog.mobile 1.0
    66
  • mobile-widgets/qml/CloudCredentials.qml

    ra842e44 r14b4c94  
    44import QtQuick.Dialogs 1.2
    55import QtQuick.Layouts 1.1
    6 import org.kde.kirigami 2.0 as Kirigami
     6import org.kde.kirigami 1.0 as Kirigami
    77import org.subsurfacedivelog.mobile 1.0
    88
  • mobile-widgets/qml/DiveDetails.qml

    r6459e45 r14b4c94  
    55import QtQuick.Layouts 1.2
    66import org.subsurfacedivelog.mobile 1.0
    7 import org.kde.kirigami 2.0 as Kirigami
     7import org.kde.kirigami 1.0 as Kirigami
    88
    99Kirigami.Page {
  • mobile-widgets/qml/DiveDetailsEdit.qml

    ra842e44 r14b4c94  
    55import QtQuick.Layouts 1.1
    66import org.subsurfacedivelog.mobile 1.0
    7 import org.kde.kirigami 2.0 as Kirigami
     7import org.kde.kirigami 1.0 as Kirigami
    88
    99Item {
  • mobile-widgets/qml/DiveDetailsView.qml

    ra842e44 r14b4c94  
    88import QtQuick.Layouts 1.1
    99import org.subsurfacedivelog.mobile 1.0
    10 import org.kde.kirigami 2.0 as Kirigami
     10import org.kde.kirigami 1.0 as Kirigami
    1111
    1212Item {
  • mobile-widgets/qml/DiveList.qml

    ra842e44 r14b4c94  
    44import QtQuick.Window 2.2
    55import QtQuick.Dialogs 1.2
    6 import org.kde.kirigami 2.0 as Kirigami
     6import org.kde.kirigami 1.0 as Kirigami
    77import org.subsurfacedivelog.mobile 1.0
    88
  • mobile-widgets/qml/DownloadFromDiveComputer.qml

    ra842e44 r14b4c94  
    66import QtQuick.Layouts 1.1
    77import org.subsurfacedivelog.mobile 1.0
    8 import org.kde.kirigami 2.0 as Kirigami
     8import org.kde.kirigami 1.0 as Kirigami
    99
    1010Kirigami.Page {
  • mobile-widgets/qml/GpsList.qml

    ra842e44 r14b4c94  
    77import QtQuick.Window 2.2
    88import org.subsurfacedivelog.mobile 1.0
    9 import org.kde.kirigami 2.0 as Kirigami
     9import org.kde.kirigami 1.0 as Kirigami
    1010
    1111Kirigami.ScrollablePage {
  • mobile-widgets/qml/Log.qml

    ra842e44 r14b4c94  
    77import QtQuick.Window 2.2
    88import org.subsurfacedivelog.mobile 1.0
    9 import org.kde.kirigami 2.0 as Kirigami
     9import org.kde.kirigami 1.0 as Kirigami
    1010
    1111Kirigami.ScrollablePage {
  • mobile-widgets/qml/Preferences.qml

    ra842e44 r14b4c94  
    44import QtQuick.Dialogs 1.2
    55import QtQuick.Layouts 1.1
    6 import org.kde.kirigami 2.0 as Kirigami
     6import org.kde.kirigami 1.0 as Kirigami
    77import org.subsurfacedivelog.mobile 1.0
    88
  • mobile-widgets/qml/StartPage.qml

    ra842e44 r14b4c94  
    33import QtQuick.Controls.Styles 1.2
    44import QtQuick.Layouts 1.1
    5 import org.kde.kirigami 2.0 as Kirigami
     5import org.kde.kirigami 1.0 as Kirigami
    66import org.subsurfacedivelog.mobile 1.0
    77
  • mobile-widgets/qml/SubsurfaceButton.qml

    ra842e44 r14b4c94  
    22import QtQuick.Controls 1.2
    33import QtQuick.Controls.Styles 1.2
    4 import org.kde.kirigami 2.0 as Kirigami
     4import org.kde.kirigami 1.0 as Kirigami
    55
    66Button {
  • mobile-widgets/qml/ThemeTest.qml

    ra842e44 r14b4c94  
    33import QtQuick.Layouts 1.1
    44import QtQuick.Window 2.2
    5 import org.kde.kirigami 2.0 as Kirigami
     5import org.kde.kirigami 1.0 as Kirigami
    66
    77Kirigami.Page {
  • mobile-widgets/qml/main.qml

    r4db80aa r14b4c94  
    77import QtQuick.Window 2.2
    88import org.subsurfacedivelog.mobile 1.0
    9 import org.kde.kirigami 2.0 as Kirigami
     9import org.kde.kirigami 1.0 as Kirigami
    1010
    1111Kirigami.ApplicationWindow {
Note: See TracChangeset for help on using the changeset viewer.