diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-17 12:30:37 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-17 12:30:37 +0200 |
commit | 4129028e25da7f42bacba68ce14ccf44d03ff59b (patch) | |
tree | 14961fd1c10d2952fff3f7aaeb45ae6ae6c0554f /src/imports/wavefrontmesh | |
parent | 8f28229cec8ce8f52cefe760b86f3410786c201a (diff) | |
parent | f806d64249c6e961ab12270d3a045e9980e19cf4 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.12-merge-5.13
Change-Id: I9b1cfefda23febfb24282bc30bc38865499ec2f4
Diffstat (limited to 'src/imports/wavefrontmesh')
-rw-r--r-- | src/imports/wavefrontmesh/qwavefrontmesh.cpp | 13 |
1 files changed, 0 insertions, 13 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: |