From 3d03f4e989e0ae53569a1a2e390d71c41d91f329 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Tue, 28 Jul 2020 15:31:44 +0200
Subject: Register QPlatformBackingStoreOpenGLSupport when needed

Static builds can not rely on a constructor function in the QtOpenGL
library, as that will be linked out unless something in the application
pulls it in.

Instead we export a helper function that clients that depend on
OpenGL support in QPlatformBackingStore can use to bring it it.

Change-Id: Ic54058bf413a476287884c78df5624b862f97695
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
---
 src/plugins/platforms/ios/qiosbackingstore.mm | 4 ++++
 src/plugins/platforms/ios/qiosintegration.mm  | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/plugins/platforms/ios')

diff --git a/src/plugins/platforms/ios/qiosbackingstore.mm b/src/plugins/platforms/ios/qiosbackingstore.mm
index db4dd81b2e..074a8ee56d 100644
--- a/src/plugins/platforms/ios/qiosbackingstore.mm
+++ b/src/plugins/platforms/ios/qiosbackingstore.mm
@@ -43,6 +43,8 @@
 #include <QtGui/QOpenGLContext>
 #include <QtGui/private/qwindow_p.h>
 
+#include <QtOpenGL/qpa/qplatformbackingstoreopenglsupport.h>
+
 #include <QtDebug>
 
 QT_BEGIN_NAMESPACE
@@ -88,4 +90,6 @@ void QIOSBackingStore::flush(QWindow *window, const QRegion &region, const QPoin
     composeAndFlush(window, region, offset, &emptyTextureList, false);
 }
 
+Q_CONSTRUCTOR_FUNCTION(qt_registerDefaultPlatformBackingStoreOpenGLSupport);
+
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/ios/qiosintegration.mm b/src/plugins/platforms/ios/qiosintegration.mm
index 962456965a..725c280129 100644
--- a/src/plugins/platforms/ios/qiosintegration.mm
+++ b/src/plugins/platforms/ios/qiosintegration.mm
@@ -66,10 +66,6 @@
 
 #import <AudioToolbox/AudioServices.h>
 
-#if QT_CONFIG(opengl)
-#include <QtOpenGL/qpa/qplatformbackingstoreopenglsupport.h>
-#endif
-
 #include <QtDebug>
 
 QT_BEGIN_NAMESPACE
-- 
cgit v1.2.3