From dbf1c74bf24eb399e1281be795cf56659adc3308 Mon Sep 17 00:00:00 2001
From: Matthew Vogt <matthew.vogt@nokia.com>
Date: Mon, 27 Feb 2012 10:35:54 +1000
Subject: Define Q_QUICK1_EXPORT independently

Define Q_QUICK1_EXPORT and Q_QUICK1_PRIVATE_EXPORT inside the
qtquick1 module rather than using the definition in qtbase.

This change undefines the definitions from qglobal.h; the undef
should be removed once the definitions have been expunged from
qtbase itself.

Change-Id: I1ee6fa1e513d110d9a298d897a8d3d465290e9ce
Reviewed-by: Martin Jones <martin.jones@nokia.com>
---
 src/declarative/qml/qdeclarativeextensioninterface.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/declarative/qml/qdeclarativeextensioninterface.h')

diff --git a/src/declarative/qml/qdeclarativeextensioninterface.h b/src/declarative/qml/qdeclarativeextensioninterface.h
index d302d286..4bad3f0b 100644
--- a/src/declarative/qml/qdeclarativeextensioninterface.h
+++ b/src/declarative/qml/qdeclarativeextensioninterface.h
@@ -42,6 +42,7 @@
 #ifndef QDECLARATIVEEXTENSIONINTERFACE_H
 #define QDECLARATIVEEXTENSIONINTERFACE_H
 
+#include <QtQuick1/qtquick1global.h>
 #include <QtCore/qobject.h>
 
 QT_BEGIN_HEADER
@@ -52,7 +53,7 @@ QT_MODULE(Declarative)
 
 class QDeclarativeEngine;
 
-struct Q_DECLARATIVE_EXPORT QDeclarativeExtensionInterface
+struct Q_QUICK1_EXPORT QDeclarativeExtensionInterface
 {
     virtual ~QDeclarativeExtensionInterface() {}
     virtual void registerTypes(const char *uri) = 0;
-- 
cgit v1.2.3