diff options
| author | Juho Annunen <juho.annunen@qt.io> | 2018-04-19 13:04:50 +0300 |
|---|---|---|
| committer | Juho Annunen <juho.annunen@qt.io> | 2018-05-04 10:03:35 +0000 |
| commit | 3fa57962a03fb540c92844f16e8cd12422486683 (patch) | |
| tree | f5085b0cfaa35fa278c4894551b817e59423cb6d /basicsuite/shared | |
| parent | 04e4798de567c64a08e962f541b5dd35d60fedd3 (diff) | |
Replace existing controls demos with controls 2 gallery example
Task-number: QTBUG-62805
Change-Id: If63369430adffa875b0e96a148a03ab908a1dea2
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Diffstat (limited to 'basicsuite/shared')
| -rw-r--r-- | basicsuite/shared/main.cpp | 12 | ||||
| -rw-r--r-- | basicsuite/shared/shared.pri | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/basicsuite/shared/main.cpp b/basicsuite/shared/main.cpp index 4600236..00ceab1 100644 --- a/basicsuite/shared/main.cpp +++ b/basicsuite/shared/main.cpp @@ -63,6 +63,8 @@ #include <QtQml/QQmlEngine> #include <QtQml/QQmlContext> #include <QtQml/QQmlComponent> +#include <QSettings> +#include <QQuickStyle> #if defined(USE_QTWEBENGINE) #include <qtwebengineglobal.h> @@ -73,7 +75,7 @@ int main(int argc, char **argv) { //qputenv("QT_IM_MODULE", QByteArray("qtvkb")); - + qputenv("QT_QUICK_CONTROLS_CONF", "/data/user/gallery/qtquickcontrols2.conf"); QApplication app(argc, argv); #if defined(USE_QTWEBENGINE) @@ -118,12 +120,20 @@ 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()); + DummyEngine engine; QQmlApplicationEngine applicationengine; QString appFont("TitilliumWeb"); applicationengine.rootContext()->setContextProperty("engine", &engine); applicationengine.rootContext()->setContextProperty("appFont", appFont); + applicationengine.rootContext()->setContextProperty("availableStyles", QQuickStyle::availableStyles()); applicationengine.load(QUrl::fromLocalFile(path + "/SharedMain.qml")); app.exec(); diff --git a/basicsuite/shared/shared.pri b/basicsuite/shared/shared.pri index 6105f78..05e0ba8 100644 --- a/basicsuite/shared/shared.pri +++ b/basicsuite/shared/shared.pri @@ -1,5 +1,5 @@ # widget dependecy is required by QtCharts demo -QT += quick widgets +QT += quick widgets quickcontrols2 qtHaveModule(webengine) { DEFINES += USE_QTWEBENGINE |