diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-09-30 10:59:54 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-09-30 11:01:24 +0200 |
| commit | 5c77df1268f717a9ca666313acfd90e16930a8e4 (patch) | |
| tree | fa3ca51c93ef36b5d07aef2c12e2ca685c02dbc4 /src/app | |
| parent | e2d0960d7705a06ffdfeb87869e2ad98e6400aed (diff) | |
| parent | 6dca1499ac867a3a66d5d1210918ec1f8ff0652c (diff) | |
| download | qt-creator-5c77df1268f717a9ca666313acfd90e16930a8e4.tar.gz | |
Merge remote-tracking branch 'origin/3.5'
Conflicts:
qtcreator.pri
Change-Id: I87576b71cee9f2f4eb856531f1a8816b1d3738db
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/main.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/app/main.cpp b/src/app/main.cpp index f8ce9a87f4..bb10f99790 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -299,8 +299,6 @@ int main(int argc, char **argv) && !qEnvironmentVariableIsSet("QT_DEVICE_PIXEL_RATIO")) { qputenv("QT_DEVICE_PIXEL_RATIO", "auto"); } -#else - qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1"); #endif // < Qt 5.6 QLoggingCategory::setFilterRules(QLatin1String("qtc.*.debug=false")); |