diff options
Diffstat (limited to 'basicsuite/shared/main.cpp')
| -rw-r--r-- | basicsuite/shared/main.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/basicsuite/shared/main.cpp b/basicsuite/shared/main.cpp index ac2fba4..808d5df 100644 --- a/basicsuite/shared/main.cpp +++ b/basicsuite/shared/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** @@ -16,8 +16,9 @@ ** ****************************************************************************/ #include <QtCore/QDebug> - -#include <QtGui/QGuiApplication> +// QtWidget (QApplication) dependecy is required by QtCharts demo, +// when QtWidget dependecy is not required use QGuiApplication from QtGui module +#include <QtWidgets/QApplication> #include <QtGui/QFont> #include <QtGui/QFontDatabase> #include <QtGui/QScreen> @@ -37,7 +38,7 @@ int main(int argc, char **argv) { //qputenv("QT_IM_MODULE", QByteArray("qtvkb")); - QGuiApplication app(argc, argv); + QApplication app(argc, argv); QString path = app.applicationDirPath(); QPalette pal; @@ -74,7 +75,13 @@ int main(int argc, char **argv) view.rootContext()->setContextProperty("engine", &engine); view.setColor(Qt::black); view.setResizeMode(QQuickView::SizeRootObjectToView); - view.setSource(QUrl::fromLocalFile(path + QStringLiteral("/loader.qml"))); + + QSize screenSize = QGuiApplication::primaryScreen()->size(); + QString mainFile = screenSize.width() < screenSize.height() + ? QStringLiteral("/main_landscape.qml") + : QStringLiteral("/SharedMain.qml"); + + view.setSource(QUrl::fromLocalFile(path + mainFile)); view.show(); app.exec(); |