diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-12-06 13:43:06 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-07 09:42:54 +0100 |
commit | 66a3c0d7a18008920ae112abf8640b2dcef04d9f (patch) | |
tree | 43f217d416809e6bf52f12240b299ba0850d2e9a /src/declarative/qml/qdeclarativecomponent_p.h | |
parent | 3bb47f45ebf1f2a5dc26067c762f30b15f2308c4 (diff) |
Fix linking of QtQuick.dll on Windows.
Put class QDeclarativeComponentAttached into a separate header.
When declared as Q_AUTOTEST_EXPORT in
declarative/qml/qdeclarativecomponent_p.h which is included by
quick/qquickloader.cpp, the Q_AUTOTEST_EXPORT is seen as
__declspec(dllexport) and linking fails.
Change-Id: I835197e3af6993cfd9325a432f33c636b9bfd3e6
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativecomponent_p.h')
-rw-r--r-- | src/declarative/qml/qdeclarativecomponent_p.h | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/src/declarative/qml/qdeclarativecomponent_p.h b/src/declarative/qml/qdeclarativecomponent_p.h index 1e6cbc8262..781a52d8d7 100644 --- a/src/declarative/qml/qdeclarativecomponent_p.h +++ b/src/declarative/qml/qdeclarativecomponent_p.h @@ -124,34 +124,6 @@ public: } }; -class Q_AUTOTEST_EXPORT QDeclarativeComponentAttached : public QObject -{ - Q_OBJECT -public: - QDeclarativeComponentAttached(QObject *parent = 0); - ~QDeclarativeComponentAttached(); - - void add(QDeclarativeComponentAttached **a) { - prev = a; next = *a; *a = this; - if (next) next->prev = &next; - } - void rem() { - if (next) next->prev = prev; - *prev = next; - next = 0; prev = 0; - } - QDeclarativeComponentAttached **prev; - QDeclarativeComponentAttached *next; - -Q_SIGNALS: - void completed(); - void destruction(); - -private: - friend class QDeclarativeVME; - friend class QDeclarativeContextData; -}; - QT_END_NAMESPACE #endif // QDECLARATIVECOMPONENT_P_H |