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

Change constructor of QWaylandClientBufferIntegration

Browse Source 
For QWaylandClientBufferIntegrations to be loadable from plugins the
constructor shold not take any arguments, but give the display in
the initialize function

Change-Id: Ie38555120d7f29c6ba7eef0f095837235782684d
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
This commit is contained in:
Jorgen Lind 2013-11-21 14:46:38 +01:00 committed by The Qt Project
parent 4875f1d1bb
commit 49eb590a92
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration.h
View File

@ -60,7 +60,7 @@ public:
QWaylandClientBufferIntegration();
virtual ~QWaylandClientBufferIntegration();
virtual void initialize() = 0;
virtual void initialize(QWaylandDisplay *display) = 0;
virtual bool waitingForEvents() { return false; }
virtual bool supportsThreadedOpenGL() const { return false; }

2
src/plugins/platforms/wayland/qwaylandintegration.cpp
View File

@ -258,6 +258,8 @@ void QWaylandIntegration::initializeBufferIntegration()
if (keys.contains(targetKey)) {
mClientBufferIntegration = QWaylandClientBufferIntegrationFactory::create(targetKey, QStringList());
}
if (mClientBufferIntegration)
mClientBufferIntegration->initialize(mDisplay);
}
QT_END_NAMESPACE