diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2015-09-28 20:53:04 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-09-29 17:37:56 +0000 |
| commit | b42bd585c4d3a6c86efb5bc5ee0ec9f00a239dcf (patch) | |
| tree | 3f53ee453c519894920f9619b29a4706540f868a | |
| parent | b2dae0276243de7ff59de3a7cd4bb19701f0e549 (diff) | |
| download | qt-creator-b42bd585c4d3a6c86efb5bc5ee0ec9f00a239dcf.tar.gz | |
Revert "Set environment variable QT_AUTO_SCREEN_SCALE_FACTOR in Qt 5.6."
This reverts commit 85e1b4d0896465b825f561330a66e5bfd3928087. Setting
that environment variable breaks the UI completely for certain
environments. If Qt itself doesn't enable auto scaling by default,
neither should Creator (for good reason, as it apparently doesn't work
yet on X11).
Worse, Qt Creator must respect the environment settings set by the user,
never override it. This commit was unconditionally setting the auto
scaling, making it impossible for me to override the settings.
Task-number: QTCREATORBUG-15115
Change-Id: I42e7ef1a481840699a8dffff140857f6c0b33713
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
| -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")); |