Merge "Merge remote-tracking branch 'origin/stable' into 5.3" into refs/staging/5.3

3 files changed, 4 insertions, 3 deletions

diff --git a/src/plugins/platforms/directfb/main.cpp b/src/plugins/platforms/directfb/main.cpp
index 423e33efd5..b0354c236d 100644
--- a/src/plugins/platforms/directfb/main.cpp
+++ b/src/plugins/platforms/directfb/main.cpp
@@ -75,7 +75,8 @@ QPlatformIntegration * QDirectFbIntegrationPlugin::create(const QString& system,
     if (!integration)
         return 0;
 
-    integration->initialize();
+    integration->connectToDirectFb();
+
     return integration;
 }
 
diff --git a/src/plugins/platforms/directfb/qdirectfbintegration.cpp b/src/plugins/platforms/directfb/qdirectfbintegration.cpp
index 7ca7da8bcd..3d1b79ef38 100644
--- a/src/plugins/platforms/directfb/qdirectfbintegration.cpp
+++ b/src/plugins/platforms/directfb/qdirectfbintegration.cpp
@@ -64,7 +64,7 @@ QDirectFbIntegration::QDirectFbIntegration()
 {
 }
 
-void QDirectFbIntegration::initialize()
+void QDirectFbIntegration::connectToDirectFb()
 {
     initializeDirectFB();
     initializeScreen();
diff --git a/src/plugins/platforms/directfb/qdirectfbintegration.h b/src/plugins/platforms/directfb/qdirectfbintegration.h
index 5822202eea..b49600bed9 100644
--- a/src/plugins/platforms/directfb/qdirectfbintegration.h
+++ b/src/plugins/platforms/directfb/qdirectfbintegration.h
@@ -60,7 +60,7 @@ public:
     QDirectFbIntegration();
     ~QDirectFbIntegration();
 
-    void initialize();
+    void connectToDirectFb();
 
     QPlatformPixmap *createPlatformPixmap(QPlatformPixmap::PixelType type) const;
     QPlatformWindow *createPlatformWindow(QWindow *window) const;