From 4c94a3ca55e82ade19ff5d4ab361d40e6252f2da Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 1 Apr 2013 22:44:32 -0700 Subject: Fix export macros for the QML parser export. These classes are in the QtQml library. They shouldn't be defined to export (even if it's autotest export) when compiling other libraries, notably QtQuick. Change-Id: Id76d2b2f2c60355240edabb7875db3e97fb0da17 Reviewed-by: Alan Alpert --- src/qml/qml/parser/qqmljsglobal_p.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qml/qml/parser/qqmljsglobal_p.h b/src/qml/qml/parser/qqmljsglobal_p.h index 3aecc863d5..c53e12ea56 100644 --- a/src/qml/qml/parser/qqmljsglobal_p.h +++ b/src/qml/qml/parser/qqmljsglobal_p.h @@ -61,8 +61,10 @@ # if defined(QT_BUILD_QMLDEVTOOLS_LIB) || defined(QT_QMLDEVTOOLS_LIB) // QmlDevTools is a static library # define QML_PARSER_EXPORT -# else +# elif defined(QT_BUILD_QML_LIB) # define QML_PARSER_EXPORT Q_AUTOTEST_EXPORT +# else +# define QML_PARSER_EXPORT # endif #endif // QT_CREATOR -- cgit v1.2.3