summaryrefslogtreecommitdiffstats
path: root/src/hardwareintegration
diff options
context:
space:
mode:
authorJorgen Lind <jorgen.lind@digia.com>2013-11-22 14:30:50 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-27 21:19:19 +0100
commit9a7e2ba9ae0ee719ed6afaa3e74cf9be9218f380 (patch)
tree560ac83e1aa2d3c45852258d4d445ef9044b6af9 /src/hardwareintegration
parentb9ffcbc7c470c5b8e02fcaf872d0506226ed4935 (diff)
Remove stale createGLIntegration functions
They are not used anymore since QtWaylandClient supports subclassing QWaylandIntegration Change-Id: I847a412725c4ce06377886b44236f9793b609399 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Diffstat (limited to 'src/hardwareintegration')
-rw-r--r--src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.cpp5
-rw-r--r--src/hardwareintegration/client/wayland-egl/qwaylandegldisplay.h4
-rw-r--r--src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.cpp5
3 files changed, 0 insertions, 14 deletions
diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.cpp b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.cpp
index f82ad6f97..197f4d2ce 100644
--- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.cpp
+++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.cpp
@@ -124,9 +124,4 @@ EGLDisplay QWaylandBrcmEglIntegration::eglDisplay() const
return m_eglDisplay;
}
-QWaylandGLIntegration *QWaylandGLIntegration::createGLIntegration(QWaylandDisplay *waylandDisplay)
-{
- return new QWaylandBrcmEglIntegration(waylandDisplay);
-}
-
QT_END_NAMESPACE
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandegldisplay.h b/src/hardwareintegration/client/wayland-egl/qwaylandegldisplay.h
index d7ad2fa3c..4eadacca2 100644
--- a/src/hardwareintegration/client/wayland-egl/qwaylandegldisplay.h
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandegldisplay.h
@@ -55,10 +55,6 @@ public:
QWaylandEglDisplay()
: QWaylandDisplay()
{ }
-
-protected:
- QWaylandGLIntegration *createGLIntegration()
- { return new QWaylandEglIntegration(); }
};
QT_END_NAMESPACE
diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.cpp b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.cpp
index 2e8b444f9..62a9b0f34 100644
--- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.cpp
+++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.cpp
@@ -49,11 +49,6 @@
QT_BEGIN_NAMESPACE
-QWaylandGLIntegration * QWaylandGLIntegration::createGLIntegration(QWaylandDisplay *waylandDisplay)
-{
- return new QWaylandXCompositeGLXIntegration(waylandDisplay);
-}
-
QWaylandXCompositeGLXIntegration::QWaylandXCompositeGLXIntegration(QWaylandDisplay *waylandDisplay)
: mWaylandDisplay(waylandDisplay)
, mWaylandComposite(0)