Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I2defae1904154283446b069d151c3ef57302ec7b

1 files changed, 3 insertions, 2 deletions

diff --git a/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp b/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
index 977df8abd0..53f48d5480 100644
--- a/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
+++ b/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
@@ -57,7 +57,6 @@ QLinuxFbIntegration::QLinuxFbIntegration(const QStringList &paramList)
     : m_fontDb(new QGenericUnixFontDatabase())
 {
     m_primaryScreen = new QLinuxFbScreen(paramList);
-    screenAdded(m_primaryScreen);
 }
 
 QLinuxFbIntegration::~QLinuxFbIntegration()
@@ -67,7 +66,9 @@ QLinuxFbIntegration::~QLinuxFbIntegration()
 
 void QLinuxFbIntegration::initialize()
 {
-    if (!m_primaryScreen->initialize())
+    if (m_primaryScreen->initialize())
+        screenAdded(m_primaryScreen);
+    else
         qWarning("linuxfb: Failed to initialize screen");
 }