diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-07-28 15:31:44 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-07-29 20:34:15 +0200 |
| commit | 3d03f4e989e0ae53569a1a2e390d71c41d91f329 (patch) | |
| tree | 4504dea0fdb942778902ff823636da531ae69aaa /src/plugins/platforms/ios | |
| parent | d14cf6d3d980e9289d95b197ca46a55e9e263b22 (diff) | |
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>
Diffstat (limited to 'src/plugins/platforms/ios')
| -rw-r--r-- | src/plugins/platforms/ios/qiosbackingstore.mm | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/ios/qiosintegration.mm | 4 |
2 files changed, 4 insertions, 4 deletions
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 ®ion, 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 |