From 91e99d142018ed0f9ace057f19984fd60571f7cc Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 25 Sep 2011 19:31:02 +0200 Subject: directfb: Initialize m_dfb after DirectFBInit has been called MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The QDirectFBIntegration is responsibe for deleting the DirectFB instance but it can only initialize the DirectFB instance after the DirectFBInit has been called. Change the order. This issue got introduced by myself in 3faa89f4. Change-Id: Ia67d439152d895e2e0a47f35eed57348c629f79f Reviewed-by: Jørgen Lind --- src/plugins/platforms/directfb/qdirectfbintegration.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/plugins/platforms/directfb/qdirectfbintegration.cpp b/src/plugins/platforms/directfb/qdirectfbintegration.cpp index ab96733027..e2fadb41fa 100644 --- a/src/plugins/platforms/directfb/qdirectfbintegration.cpp +++ b/src/plugins/platforms/directfb/qdirectfbintegration.cpp @@ -79,8 +79,7 @@ QDirectFbScreen::QDirectFbScreen(int display) } QDirectFbIntegration::QDirectFbIntegration() - : m_dfb(QDirectFbConvenience::dfbInterface()) - , m_fontDb(new QGenericUnixFontDatabase()) + : m_fontDb(new QGenericUnixFontDatabase()) , m_eventDispatcher(createUnixEventDispatcher()) { QGuiApplicationPrivate::instance()->setEventDispatcher(m_eventDispatcher); @@ -102,6 +101,9 @@ QDirectFbIntegration::QDirectFbIntegration() delete[] argv[i]; delete[] argv; + // This must happen after DirectFBInit. + m_dfb.reset(QDirectFbConvenience::dfbInterface()); + m_primaryScreen.reset(new QDirectFbScreen(0)); screenAdded(m_primaryScreen.data()); -- cgit v1.2.3