diff options
author | Juho Annunen <juho.annunen@qt.io> | 2018-07-17 15:50:48 +0300 |
---|---|---|
committer | Juho Annunen <juho.annunen@qt.io> | 2018-07-19 08:56:46 +0000 |
commit | 57bc95f418a0e42921bba984d35d5999c6a6cf8f (patch) | |
tree | 4960cd1f68e8bec314032ad2522432b8f7096132 | |
parent | a5ba6719eaae7c7a79c43005fa0213626aec3496 (diff) |
Fix qtquickcontrols2 demo image paths & controls theme
Task-number: QTBUG-62805
Change-Id: I6cbd41384c003b1e29567af0c0c56341d5e93f6e
Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
-rw-r--r-- | basicsuite/qtquickcontrols2/main.qml | 10 | ||||
-rw-r--r-- | basicsuite/qtquickcontrols2/pages/DialogPage.qml | 2 | ||||
-rw-r--r-- | basicsuite/qtquickcontrols2/pages/ScrollBarPage.qml | 2 | ||||
-rw-r--r-- | basicsuite/qtquickcontrols2/pages/ScrollIndicatorPage.qml | 2 | ||||
-rw-r--r-- | basicsuite/qtquickcontrols2/pages/SwipeViewPage.qml | 2 | ||||
-rw-r--r-- | basicsuite/qtquickcontrols2/pages/TabBarPage.qml | 2 | ||||
-rw-r--r-- | basicsuite/qtquickcontrols2/qtquickcontrols2.pro | 14 | ||||
-rw-r--r-- | basicsuite/shared/main.cpp | 17 |
8 files changed, 27 insertions, 24 deletions
diff --git a/basicsuite/qtquickcontrols2/main.qml b/basicsuite/qtquickcontrols2/main.qml index cf9522b..473cdea 100644 --- a/basicsuite/qtquickcontrols2/main.qml +++ b/basicsuite/qtquickcontrols2/main.qml @@ -88,7 +88,7 @@ Page { anchors.fill: parent ToolButton { - icon.source: stackView.depth > 1 ? "back.png" : "drawer.png" + icon.name: stackView.depth > 1 ? "back" : "drawer" onClicked: { if (stackView.depth > 1) { stackView.pop() @@ -110,7 +110,7 @@ Page { } ToolButton { - icon.source: "menu.png" + icon.name: "menu" onClicked: optionsMenu.open() Menu { @@ -150,7 +150,7 @@ Page { highlighted: ListView.isCurrentItem onClicked: { listView.currentIndex = index - stackView.push(model.source) + stackView.push("pages/" + model.source) drawer.close() } } @@ -202,7 +202,7 @@ Page { anchors.centerIn: parent anchors.verticalCenterOffset: -50 fillMode: Image.PreserveAspectFit - source: "qt-logo.png" + source: "images/qt-logo.png" } Label { @@ -219,7 +219,7 @@ Page { Image { id: arrow - source: "arrow.png" + source: "images/arrow.png" anchors.left: parent.left anchors.bottom: parent.bottom } diff --git a/basicsuite/qtquickcontrols2/pages/DialogPage.qml b/basicsuite/qtquickcontrols2/pages/DialogPage.qml index 6458bf1..8bade21 100644 --- a/basicsuite/qtquickcontrols2/pages/DialogPage.qml +++ b/basicsuite/qtquickcontrols2/pages/DialogPage.qml @@ -156,7 +156,7 @@ ScrollablePage { width: parent.width / 2 anchors.horizontalCenter: parent.horizontalCenter fillMode: Image.PreserveAspectFit - source: "qt-logo.png" + source: "../images/qt-logo.png" } Label { diff --git a/basicsuite/qtquickcontrols2/pages/ScrollBarPage.qml b/basicsuite/qtquickcontrols2/pages/ScrollBarPage.qml index cc7de11..aaa1d8e 100644 --- a/basicsuite/qtquickcontrols2/pages/ScrollBarPage.qml +++ b/basicsuite/qtquickcontrols2/pages/ScrollBarPage.qml @@ -77,7 +77,7 @@ Flickable { Image { rotation: 90 - source: "arrows.png" + source: "../images/arrows.png" anchors.horizontalCenter: parent.horizontalCenter } } diff --git a/basicsuite/qtquickcontrols2/pages/ScrollIndicatorPage.qml b/basicsuite/qtquickcontrols2/pages/ScrollIndicatorPage.qml index dd5ef46..89b8bc1 100644 --- a/basicsuite/qtquickcontrols2/pages/ScrollIndicatorPage.qml +++ b/basicsuite/qtquickcontrols2/pages/ScrollIndicatorPage.qml @@ -77,7 +77,7 @@ Flickable { Image { rotation: 90 - source: "arrows.png" + source: "../images/arrows.png" anchors.horizontalCenter: parent.horizontalCenter } } diff --git a/basicsuite/qtquickcontrols2/pages/SwipeViewPage.qml b/basicsuite/qtquickcontrols2/pages/SwipeViewPage.qml index 3c5d04c..d09ac50 100644 --- a/basicsuite/qtquickcontrols2/pages/SwipeViewPage.qml +++ b/basicsuite/qtquickcontrols2/pages/SwipeViewPage.qml @@ -79,7 +79,7 @@ Pane { } Image { - source: "arrows.png" + source: "../images/arrows.png" anchors.horizontalCenter: parent.horizontalCenter } } diff --git a/basicsuite/qtquickcontrols2/pages/TabBarPage.qml b/basicsuite/qtquickcontrols2/pages/TabBarPage.qml index 925691a..16200fc 100644 --- a/basicsuite/qtquickcontrols2/pages/TabBarPage.qml +++ b/basicsuite/qtquickcontrols2/pages/TabBarPage.qml @@ -79,7 +79,7 @@ Page { } Image { - source: "arrows.png" + source: "../images/arrows.png" anchors.horizontalCenter: parent.horizontalCenter } } diff --git a/basicsuite/qtquickcontrols2/qtquickcontrols2.pro b/basicsuite/qtquickcontrols2/qtquickcontrols2.pro index 9834b89..1d3eac1 100644 --- a/basicsuite/qtquickcontrols2/qtquickcontrols2.pro +++ b/basicsuite/qtquickcontrols2/qtquickcontrols2.pro @@ -1,15 +1,15 @@ -TARGET = gallery +TARGET = qtquickcontrols2 include(../shared/shared.pri) b2qtdemo_deploy_defaults() content.files = \ - main.qml \ - qtquickcontrols2.conf \ - icons/gallery/index.theme \ - $$files(icons/*.png, true) \ - $$files(images/*.png) \ - $$files(pages/*.qml) + $$PWD/preview_l.jpg \ + $$PWD/main.qml \ + $$PWD/qtquickcontrols2.conf \ + $$PWD/images \ + $$PWD/icons \ + $$PWD/pages content.path = $$DESTPATH diff --git a/basicsuite/shared/main.cpp b/basicsuite/shared/main.cpp index 6fba612..265092c 100644 --- a/basicsuite/shared/main.cpp +++ b/basicsuite/shared/main.cpp @@ -65,6 +65,7 @@ #include <QtQml/QQmlComponent> #include <QSettings> #include <QQuickStyle> +#include <QIcon> #if defined(USE_QTWEBENGINE) #include <qtwebengineglobal.h> @@ -75,7 +76,10 @@ int main(int argc, char **argv) { //qputenv("QT_IM_MODULE", QByteArray("qtvkb")); - qputenv("QT_QUICK_CONTROLS_CONF", "/data/user/gallery/qtquickcontrols2.conf"); + qputenv("QT_QUICK_CONTROLS_CONF", "/data/user/qt/qtquickcontrols2/qtquickcontrols2.conf"); + QIcon::setThemeName("gallery"); + QIcon::setThemeSearchPaths(QStringList() << "/data/user/qt/qtquickcontrols2/icons"); + QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication app(argc, argv); #if defined(USE_QTWEBENGINE) @@ -131,12 +135,11 @@ int main(int argc, char **argv) QGuiApplication::setFont(font); } - QSettings settings; - QString style = QQuickStyle::name(); - if (!style.isEmpty()) - settings.setValue("style", "Material"); - else - QQuickStyle::setStyle(settings.value("style").toString()); + QSettings styleSettings; + QString style = styleSettings.value("style").toString(); + if (style.isEmpty() || style == "Default") + styleSettings.setValue("style", "Material"); + QQuickStyle::setStyle(styleSettings.value("style").toString()); DummyEngine engine; |