diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-03-17 14:20:25 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-03-17 14:21:03 +0200 |
| commit | 4d1c99f7214dd1638e43af217758e1a9b9c25f10 (patch) | |
| tree | 5c5cf5c58bc94c835a3b9361c10e6529148ca8ac | |
| parent | 11ff88fca3c0b41dbccfdbf65bd19ed2dce576b2 (diff) | |
| parent | 8ba4d3f4ca0d7ccccf729d84845855d451240649 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
* origin/5.14:
8ba4d3f Remove emulator specific code from launcher
Change-Id: I1a8173987aba8b59ca0a023b733cdec9261f9397
| -rw-r--r-- | src/main.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/main.cpp b/src/main.cpp index 9a993b4..154973c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -84,10 +84,7 @@ int main(int argc, char **argv) QIcon::setThemeName("gallery"); - // 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); app.setApplicationVersion(APPLICATION_VERSION); |