diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-07-31 13:56:25 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-08-02 08:21:18 +0000 |
| commit | 007c60e193285be1a6a51b252bd80aae45d5c809 (patch) | |
| tree | c607041b98c3e04e88f71f0923f09bc9f030479c | |
| parent | 69cca470fe5636529827312b9961b648ec7eb122 (diff) | |
Do not access screens before initialize()
Change-Id: I1d6eaa5a1525ae060f8a9f37ae4295bee2f4bb38
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 00b0c464df..54bd654ce5 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -1183,8 +1183,6 @@ void QGuiApplicationPrivate::createPlatformIntegration() if (!icon.isEmpty()) forcedWindowIcon = QDir::isAbsolutePath(icon) ? QIcon(icon) : QIcon::fromTheme(icon); - - QHighDpiScaling::updateHighDpiScaling(); } /*! @@ -1212,6 +1210,10 @@ void QGuiApplicationPrivate::eventDispatcherReady() createPlatformIntegration(); platform_integration->initialize(); + + // Do this here in order to play nice with platforms that add screens only + // in initialize(). + QHighDpiScaling::updateHighDpiScaling(); } void QGuiApplicationPrivate::init() |