diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2017-11-17 02:45:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@automotivelinux.org> | 2017-11-17 02:45:36 +0000 |
| commit | 2fa542a8c95b196020e5f27f96cbffa7c44e72e9 (patch) | |
| tree | d257a2c496dce867d40cf38d050012e7a186eb13 | |
| parent | e14318d2d3507252d8d2e3c2dc8bff74c0446f7a (diff) | |
| parent | 47d1b5d1badc999c4cab20bbe801ef1f0e67c49c (diff) | |
Merge "Replace Qt Quick Controls 1.x with 2.x API"
| -rw-r--r-- | homescreen/qml/MediaArea.qml | 2 | ||||
| -rw-r--r-- | homescreen/qml/MediaAreaMusic.qml | 2 | ||||
| -rw-r--r-- | homescreen/qml/StatusArea.qml | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/homescreen/qml/MediaArea.qml b/homescreen/qml/MediaArea.qml index d7159d2..0447589 100644 --- a/homescreen/qml/MediaArea.qml +++ b/homescreen/qml/MediaArea.qml @@ -16,7 +16,7 @@ */ import QtQuick 2.2 -import QtQuick.Controls 1.0 +import QtQuick.Controls 2.0 StackView { id: root diff --git a/homescreen/qml/MediaAreaMusic.qml b/homescreen/qml/MediaAreaMusic.qml index 927e82c..c0408e6 100644 --- a/homescreen/qml/MediaAreaMusic.qml +++ b/homescreen/qml/MediaAreaMusic.qml @@ -17,7 +17,7 @@ import QtQuick 2.2 import QtQuick.Layouts 1.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 2.0 Image { width: 1080 diff --git a/homescreen/qml/StatusArea.qml b/homescreen/qml/StatusArea.qml index 3fc3079..4dbe0ba 100644 --- a/homescreen/qml/StatusArea.qml +++ b/homescreen/qml/StatusArea.qml @@ -17,7 +17,6 @@ import QtQuick 2.2 import QtQuick.Layouts 1.1 -import QtQuick.Controls 1.0 import HomeScreen 1.0 Item { |