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>
bb10
Laszlo Agocs 2015-07-31 13:56:25 +02:00
parent 69cca470fe
commit 007c60e193
1 changed files with 4 additions and 2 deletions

View File

@ -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()