diff options
| author | Michael Brasser <michael.brasser@live.com> | 2013-03-26 14:53:38 -0500 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-02 16:42:44 +0200 |
| commit | cedd342523e986028b8b4799cd564cd9307ebe12 (patch) | |
| tree | fa6af8c609c1704af49716c070ad9efc06c906e7 /examples | |
| parent | f9bf2fb4beebdee9ccfebc35579964c0d3b96dbd (diff) | |
Fix incorrect merge in textureprovider example.
Change-Id: I5a76ab1ef77c43aecd2a03cc7d614a198290f427
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/quick/textureprovider/etcprovider.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/examples/quick/textureprovider/etcprovider.h b/examples/quick/textureprovider/etcprovider.h index b7f2f3d67d..3256ae929d 100644 --- a/examples/quick/textureprovider/etcprovider.h +++ b/examples/quick/textureprovider/etcprovider.h @@ -65,7 +65,6 @@ private: class EtcTexture : public QSGTexture { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qml.QmlOstPlugin") public: EtcTexture(); ~EtcTexture(); |