diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-07-12 07:19:50 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-07-12 15:26:17 +0200 |
| commit | 9dcec8f016c1fdd9d0e99e0ee717523a8823bca7 (patch) | |
| tree | 18fd4418a7c2399fb1c52ea9053a3808e8d068de | |
| parent | f3d40896c1d8601703fcbf30214e22f50eb72727 (diff) | |
Fix static build
Use the GL attribute name helper functions only from QtQuick to avoid
a clash of symbols when linking statically.
Change-Id: Ic95b984092f5db222db6dc1f4ac5fb443b5ab714
Fixes: QTBUG-77012
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| -rw-r--r-- | src/imports/wavefrontmesh/qwavefrontmesh.cpp | 13 | ||||
| -rw-r--r-- | src/quick/items/qquickshadereffectmesh_p.h | 4 |
2 files changed, 2 insertions, 15 deletions
diff --git a/src/imports/wavefrontmesh/qwavefrontmesh.cpp b/src/imports/wavefrontmesh/qwavefrontmesh.cpp index 101e6ab4b0..e973ef0103 100644 --- a/src/imports/wavefrontmesh/qwavefrontmesh.cpp +++ b/src/imports/wavefrontmesh/qwavefrontmesh.cpp @@ -53,19 +53,6 @@ QT_BEGIN_NAMESPACE -static const char qt_position_attribute_name[] = "qt_Vertex"; -static const char qt_texcoord_attribute_name[] = "qt_MultiTexCoord0"; - -const char *qtPositionAttributeName() -{ - return qt_position_attribute_name; -} - -const char *qtTexCoordAttributeName() -{ - return qt_texcoord_attribute_name; -} - class QWavefrontMeshPrivate : public QObjectPrivate { public: diff --git a/src/quick/items/qquickshadereffectmesh_p.h b/src/quick/items/qquickshadereffectmesh_p.h index 62a9798e40..79e05a5f9f 100644 --- a/src/quick/items/qquickshadereffectmesh_p.h +++ b/src/quick/items/qquickshadereffectmesh_p.h @@ -66,8 +66,8 @@ QT_REQUIRE_CONFIG(quick_shadereffect); QT_BEGIN_NAMESPACE -const char *qtPositionAttributeName(); -const char *qtTexCoordAttributeName(); +Q_QUICK_PRIVATE_EXPORT const char *qtPositionAttributeName(); +Q_QUICK_PRIVATE_EXPORT const char *qtTexCoordAttributeName(); class QSGGeometry; class QRectF; |