From f79768cd39a58529656b320bfaa9c096eccb191d Mon Sep 17 00:00:00 2001
From: Matthew Vogt <matthew.vogt@nokia.com>
Date: Fri, 24 Feb 2012 10:51:42 +1000
Subject: [PATCH] Remove Q_DECLARATIVE_EXPORT and Q_QTQUICK1_EXPORT

Theses definitions are no longer required in qtbase.

Task-number: QTBUG-23737
Change-Id: Ib11e5840086b44120adabe83a1b068c991920f2f
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/global/qglobal.h | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 1fb5778f14..fb6eaeb452 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -610,16 +610,6 @@ class QDataStream;
 #    else
 #      define Q_SVG_EXPORT Q_DECL_IMPORT
 #    endif
-#    if defined(QT_BUILD_QTQUICK1_LIB)
-#      define Q_QTQUICK1_EXPORT Q_DECL_EXPORT
-#    else
-#      define Q_QTQUICK1_EXPORT Q_DECL_IMPORT
-#    endif
-#    if defined(QT_BUILD_DECLARATIVE_LIB)
-#      define Q_DECLARATIVE_EXPORT Q_DECL_EXPORT
-#    else
-#      define Q_DECLARATIVE_EXPORT Q_DECL_IMPORT
-#    endif
 #    if defined(QT_BUILD_OPENGL_LIB)
 #      define Q_OPENGL_EXPORT Q_DECL_EXPORT
 #    else
@@ -680,8 +670,6 @@ class QDataStream;
 #    define Q_SQL_EXPORT Q_DECL_IMPORT
 #    define Q_NETWORK_EXPORT Q_DECL_IMPORT
 #    define Q_SVG_EXPORT Q_DECL_IMPORT
-#    define Q_DECLARATIVE_EXPORT Q_DECL_IMPORT
-#    define Q_QTQUICK1_EXPORT Q_DECL_IMPORT
 #    define Q_CANVAS_EXPORT Q_DECL_IMPORT
 #    define Q_OPENGL_EXPORT Q_DECL_IMPORT
 #    define Q_MULTIMEDIA_EXPORT Q_DECL_IMPORT
@@ -714,8 +702,6 @@ class QDataStream;
 #    define Q_SQL_EXPORT Q_DECL_EXPORT
 #    define Q_NETWORK_EXPORT Q_DECL_EXPORT
 #    define Q_SVG_EXPORT Q_DECL_EXPORT
-#    define Q_DECLARATIVE_EXPORT Q_DECL_EXPORT
-#    define Q_QTQUICK1_EXPORT Q_DECL_EXPORT
 #    define Q_OPENGL_EXPORT Q_DECL_EXPORT
 #    define Q_MULTIMEDIA_EXPORT Q_DECL_EXPORT
 #    define Q_OPENVG_EXPORT Q_DECL_EXPORT
@@ -734,8 +720,6 @@ class QDataStream;
 #    define Q_SQL_EXPORT
 #    define Q_NETWORK_EXPORT
 #    define Q_SVG_EXPORT
-#    define Q_DECLARATIVE_EXPORT
-#    define Q_QTQUICK1_EXPORT
 #    define Q_OPENGL_EXPORT
 #    define Q_MULTIMEDIA_EXPORT
 #    define Q_OPENVG_EXPORT