summaryrefslogtreecommitdiffstats
path: root/basicsuite/qtquickcontrols2/gallery.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'basicsuite/qtquickcontrols2/gallery.cpp')
-rw-r--r--basicsuite/qtquickcontrols2/gallery.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/basicsuite/qtquickcontrols2/gallery.cpp b/basicsuite/qtquickcontrols2/gallery.cpp
index 04b988a..f6c6f66 100644
--- a/basicsuite/qtquickcontrols2/gallery.cpp
+++ b/basicsuite/qtquickcontrols2/gallery.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
@@ -59,7 +59,11 @@ int main(int argc, char *argv[])
{
QGuiApplication::setApplicationName("Gallery");
QGuiApplication::setOrganizationName("QtProject");
- QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+
+ // Do not set HighDpiScaling for emulator, see QTBUG-64815
+ if (qEnvironmentVariableIsEmpty("QTGLESSTREAM_DISPLAY")) {
+ QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+ }
QGuiApplication app(argc, argv);