From 231b31ebec86078df293fbf9e265c5223d9e703b Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Mon, 25 Sep 2017 14:20:09 +0200 Subject: iot-sensortag: Show fullscreen on Android Change-Id: I14a2e55adea3072c23cd25b27d5f65c08a176857 Reviewed-by: Alex Blasche --- tradeshow/iot-sensortag/main.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'tradeshow') diff --git a/tradeshow/iot-sensortag/main.cpp b/tradeshow/iot-sensortag/main.cpp index 555d1a8..5dd9a7e 100644 --- a/tradeshow/iot-sensortag/main.cpp +++ b/tradeshow/iot-sensortag/main.cpp @@ -129,10 +129,15 @@ int main(int argc, char *argv[]) QString mainFile; QUrl styleFile; - QString uiVariant; - bool fullScreen; - int appWidth = 0; - int appHeight = 0; + QString uiVariant = QStringLiteral("small"); + bool fullScreen = +#ifdef Q_OS_ANDROID + true; +#else + false; +#endif + int appWidth = 1920; + int appHeight = 1080; QScreen* scr = qApp->screens().at(0); @@ -151,11 +156,6 @@ int main(int argc, char *argv[]) mainFile = namingScheme + QStringLiteral("/resources/small/MainSmall.qml"); styleFile = namingScheme + QStringLiteral("/resources/small/StyleSmall.qml"); - uiVariant = "small"; - fullScreen = false; - appWidth = 1920; - appHeight = 1080; - qmlRegisterSingletonType(styleFile, "Style", 1,0, "Style"); if (qEnvironmentVariableIsSet("QT_IOS_DEMO_NO_FULLSCREEN")) { -- cgit v1.2.3