From fa9ddd00a4ad71cffef7ed25e73de8df881f8a16 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Thu, 5 Dec 2019 13:51:11 +0200 Subject: Remove emulator specific code blocks from demos Change-Id: Ibd470c1e1167aae40ec275052f12136fa18bd01f Reviewed-by: Samuli Piippo --- basicsuite/qtquickcontrols2/gallery.cpp | 5 +---- basicsuite/shared/main.cpp | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/basicsuite/qtquickcontrols2/gallery.cpp b/basicsuite/qtquickcontrols2/gallery.cpp index f6c6f66..bbe4c71 100644 --- a/basicsuite/qtquickcontrols2/gallery.cpp +++ b/basicsuite/qtquickcontrols2/gallery.cpp @@ -60,10 +60,7 @@ int main(int argc, char *argv[]) QGuiApplication::setApplicationName("Gallery"); QGuiApplication::setOrganizationName("QtProject"); - // Do not set HighDpiScaling for emulator, see QTBUG-64815 - if (qEnvironmentVariableIsEmpty("QTGLESSTREAM_DISPLAY")) { - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - } + QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication app(argc, argv); diff --git a/basicsuite/shared/main.cpp b/basicsuite/shared/main.cpp index f303603..9e27596 100644 --- a/basicsuite/shared/main.cpp +++ b/basicsuite/shared/main.cpp @@ -95,10 +95,7 @@ int main(int argc, char **argv) QIcon::setThemeName("gallery"); QIcon::setThemeSearchPaths(QStringList() << "/data/user/qt/qtquickcontrols2/icons"); - // Do not set HighDpiScaling for emulator, see QTBUG-64815 - if (qEnvironmentVariableIsEmpty("QTGLESSTREAM_DISPLAY")) { - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - } + QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication app(argc, argv); -- cgit v1.2.3