1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Ibf1b8a03c5153895ec03af5844c0b6addc4a0aa0
This commit is contained in:
Sergio Ahumada 2014-06-17 13:34:42 +02:00
commit 753be5af04
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/platforms/directfb/main.cpp
View File

@ -75,7 +75,8 @@ QPlatformIntegration * QDirectFbIntegrationPlugin::create(const QString& system,
if (!integration) if (!integration)
return 0; return 0;
integration->initialize(); integration->connectToDirectFb();
return integration; return integration;
} }

2
src/plugins/platforms/directfb/qdirectfbintegration.cpp
View File

@ -64,7 +64,7 @@ QDirectFbIntegration::QDirectFbIntegration()
{ {
} }
void QDirectFbIntegration::initialize() void QDirectFbIntegration::connectToDirectFb()
{ {
initializeDirectFB(); initializeDirectFB();
initializeScreen(); initializeScreen();

2
src/plugins/platforms/directfb/qdirectfbintegration.h
View File

@ -60,7 +60,7 @@ public:
QDirectFbIntegration(); QDirectFbIntegration();
~QDirectFbIntegration(); ~QDirectFbIntegration();
void initialize(); void connectToDirectFb();
QPlatformPixmap *createPlatformPixmap(QPlatformPixmap::PixelType type) const; QPlatformPixmap *createPlatformPixmap(QPlatformPixmap::PixelType type) const;
QPlatformWindow *createPlatformWindow(QWindow *window) const; QPlatformWindow *createPlatformWindow(QWindow *window) const;