diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-06-25 11:28:27 +0200 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-06-25 19:33:12 +0200 |
| commit | b10e4e846e7b1a7b4c9c7cb7b4ef1081e22f2354 (patch) | |
| tree | 9f54caca16ad66a0d980334ea45f1ea8d5008993 /src/opengl | |
| parent | 7968281444c967628566337ce3493058825cb946 (diff) | |
Migrate to autogenerated cpp exports
Replace the hardcoded cpp exports with a generated one where it's
applicable.
Task-number: QTBUG-90492
Change-Id: Idc160b594987b2c765e75bd669aae851b4366282
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/opengl/qtopenglglobal.h | 15 |
2 files changed, 2 insertions, 14 deletions
diff --git a/src/opengl/CMakeLists.txt b/src/opengl/CMakeLists.txt index a6e2e56561..1d92e89998 100644 --- a/src/opengl/CMakeLists.txt +++ b/src/opengl/CMakeLists.txt @@ -44,6 +44,7 @@ qt_internal_add_module(OpenGL PRIVATE_MODULE_INTERFACE Qt::CorePrivate Qt::GuiPrivate + GENERATE_CPP_EXPORTS ) ## Scopes: diff --git a/src/opengl/qtopenglglobal.h b/src/opengl/qtopenglglobal.h index 861fb16d59..58a76dbffd 100644 --- a/src/opengl/qtopenglglobal.h +++ b/src/opengl/qtopenglglobal.h @@ -42,19 +42,6 @@ #include <QtCore/qglobal.h> #include <QtGui/qtguiglobal.h> - -QT_BEGIN_NAMESPACE - -#ifndef QT_STATIC -# if defined(QT_BUILD_OPENGL_LIB) -# define Q_OPENGL_EXPORT Q_DECL_EXPORT -# else -# define Q_OPENGL_EXPORT Q_DECL_IMPORT -# endif -#else -# define Q_OPENGL_EXPORT -#endif - -QT_END_NAMESPACE +#include <QtOpenGL/qtopenglexports.h> #endif // QTOPENGLGLOBAL_H |