Remove QNX dead-code

Hasn't compiled in many years

Change-Id: I754fc5fee5c2fff51fb3b701fa81afbed7f60b8b
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

3 files changed, 1 insertions, 48 deletions

diff --git a/src/core/compositor/chromium_gpu_helper.cpp b/src/core/compositor/chromium_gpu_helper.cpp
index 71d0f3687..1ddbf75e5 100644
--- a/src/core/compositor/chromium_gpu_helper.cpp
+++ b/src/core/compositor/chromium_gpu_helper.cpp
@@ -57,9 +57,7 @@
 #include "content/gpu/gpu_child_thread.h"
 #include "gpu/ipc/service/gpu_channel_manager.h"
 
-#ifdef Q_OS_QNX
-#include "content/common/gpu/stream_texture_qnx.h"
-#endif
+#include <QtGlobal> // We need this for Q_UNUSED
 
 scoped_refptr<base::SingleThreadTaskRunner> gpu_task_runner()
 {
@@ -87,15 +85,3 @@ void ProgressFlingIfNeeded(content::RenderWidgetHost *host, const base::TimeTick
 {
     content::RenderWidgetHostImpl::From(host)->ProgressFlingIfNeeded(current_time);
 }
-
-#ifdef Q_OS_QNX
-EGLStreamData eglstream_connect_consumer(gpu::Texture *tex)
-{
-    EGLStreamData egl_stream;
-    content::StreamTexture* image = static_cast<content::StreamTexture *>(tex->GetLevelImage(GL_TEXTURE_EXTERNAL_OES, 0));
-    if (image) {
-        image->ConnectConsumerIfNeeded(&egl_stream.egl_display, &egl_stream.egl_str_handle);
-    }
-    return egl_stream;
-}
-#endif
diff --git a/src/core/compositor/chromium_gpu_helper.h b/src/core/compositor/chromium_gpu_helper.h
index 4086d12ab..e692b9b85 100644
--- a/src/core/compositor/chromium_gpu_helper.h
+++ b/src/core/compositor/chromium_gpu_helper.h
@@ -40,8 +40,6 @@
 #ifndef CHROMIUM_GPU_HELPER_H
 #define CHROMIUM_GPU_HELPER_H
 
-#include <QtGlobal> // We need this for the Q_OS_QNX define.
-
 #include "base/memory/scoped_refptr.h"
 
 namespace base {
@@ -72,18 +70,4 @@ unsigned int service_id(gpu::TextureBase *tex);
 
 void ProgressFlingIfNeeded(content::RenderWidgetHost *host, const base::TimeTicks &current_time);
 
-#ifdef Q_OS_QNX
-typedef void* EGLDisplay;
-typedef void* EGLStreamKHR;
-
-struct EGLStreamData {
-    EGLDisplay egl_display;
-    EGLStreamKHR egl_str_handle;
-
-    EGLStreamData(): egl_display(NULL), egl_str_handle(NULL) {}
-};
-
-EGLStreamData eglstream_connect_consumer(gpu::Texture *tex);
-#endif
-
 #endif // CHROMIUM_GPU_HELPER_H
diff --git a/src/core/compositor/delegated_frame_node.cpp b/src/core/compositor/delegated_frame_node.cpp
index fcaae27bb..06ca49f4f 100644
--- a/src/core/compositor/delegated_frame_node.cpp
+++ b/src/core/compositor/delegated_frame_node.cpp
@@ -136,9 +136,6 @@ private:
 #if defined(USE_OZONE)
     bool m_ownsTexture;
 #endif
-#ifdef Q_OS_QNX
-    EGLStreamData m_eglStreamData;
-#endif
     friend class DelegatedFrameNode;
 };
 #endif // QT_CONFIG(opengl)
@@ -461,20 +458,6 @@ void MailboxTexture::bind()
     if (m_fence)
         m_fence->wait();
     glBindTexture(m_target, m_textureId);
-#ifdef Q_OS_QNX
-    if (m_target == GL_TEXTURE_EXTERNAL_OES) {
-        static bool resolved = false;
-        static PFNEGLSTREAMCONSUMERACQUIREKHRPROC eglStreamConsumerAcquire = 0;
-
-        if (!resolved) {
-            QOpenGLContext *context = QOpenGLContext::currentContext();
-            eglStreamConsumerAcquire = (PFNEGLSTREAMCONSUMERACQUIREKHRPROC)context->getProcAddress("eglStreamConsumerAcquireKHR");
-            resolved = true;
-        }
-        if (eglStreamConsumerAcquire)
-            eglStreamConsumerAcquire(m_eglStreamData.egl_display, m_eglStreamData.egl_str_handle);
-    }
-#endif
 }
 #endif // QT_CONFIG(opengl)