diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-02-27 10:35:54 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-27 02:51:54 +0100 |
| commit | dbf1c74bf24eb399e1281be795cf56659adc3308 (patch) | |
| tree | 289035112cd85310e2f55615cd0f3078832f7e95 /src/declarative/qml/qdeclarativecontext.h | |
| parent | c9cf51b931961fdb0410a21e03b4cd8667560584 (diff) | |
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>
Diffstat (limited to 'src/declarative/qml/qdeclarativecontext.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativecontext.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativecontext.h b/src/declarative/qml/qdeclarativecontext.h index e71e3c05..233906ed 100644 --- a/src/declarative/qml/qdeclarativecontext.h +++ b/src/declarative/qml/qdeclarativecontext.h @@ -42,6 +42,7 @@ #ifndef QDECLARATIVECONTEXT_H #define QDECLARATIVECONTEXT_H +#include <QtQuick1/qtquick1global.h> #include <QtCore/qurl.h> #include <QtCore/qobject.h> #include <QtScript/qscriptvalue.h> @@ -61,7 +62,7 @@ class QDeclarativeContextPrivate; class QDeclarativeCompositeTypeData; class QDeclarativeContextData; -class Q_DECLARATIVE_EXPORT QDeclarativeContext : public QObject +class Q_QUICK1_EXPORT QDeclarativeContext : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativeContext) |