summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2016-04-08 12:35:48 +0200
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2016-04-14 14:07:18 +0000
commite33532e048fa12ee32429ca83ee31aa8f065147d (patch)
tree6e8bef7373dbee3e21f7ebeeb45ee8052c180550
parented2d5b7f44f9d0a25aa185d3843ee14366ffef7c (diff)
downloadqttools-e33532e048fa12ee32429ca83ee31aa8f065147d.tar.gz
Qt Assistant: Set Qt::AA_EnableHighDpiScaling for Windows only.
Scaling does not work overly well on Linux. Amends change a6a665bdb147d0a0fbfcd65053718a54e1d9815b. Task-number: QTBUG-50698 Task-number: QTBUG-52318 Change-Id: I0fd0f6c2dbec0d5fabc9d7e4cec82515f8357b03 Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
-rw-r--r--src/assistant/assistant/main.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/assistant/assistant/main.cpp b/src/assistant/assistant/main.cpp
index 4d097aaf1..81a612755 100644
--- a/src/assistant/assistant/main.cpp
+++ b/src/assistant/assistant/main.cpp
@@ -293,7 +293,9 @@ void setupTranslations()
int main(int argc, char *argv[])
{
+#ifdef Q_OS_WIN
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+#endif
TRACE_OBJ
QScopedPointer<QCoreApplication> a(createApplication(argc, argv));
a->addLibraryPath(a->applicationDirPath() + QLatin1String("/plugins"));