From cedd342523e986028b8b4799cd564cd9307ebe12 Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@live.com>
Date: Tue, 26 Mar 2013 14:53:38 -0500
Subject: 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>
---
 examples/quick/textureprovider/etcprovider.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'examples/quick')

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();
-- 
cgit v1.2.3