diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-08-31 16:43:22 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-08-31 17:02:05 +0200 |
| commit | 01335edc94d2961bd4061ed2cb81ebd1151797bf (patch) | |
| tree | 54df7d2d0857278198258e4d8a65bf63cb35d91a /src/declarative/qml/ftw | |
| parent | 20c3575fc39004d6a556820543982f4a6ebef0be (diff) | |
Fix export symbols for QtDeclarative and QtQuick1.
Fix build on Windows and compiler warnings.
Requires 090ee21eac7257644422e35395194e5fd7fb8efa in qtbase.
Change-Id: Ief8da504ccd3e2c2e78644cc9943d685c4302019
Reviewed-on: http://codereview.qt.nokia.com/3988
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/declarative/qml/ftw')
| -rw-r--r-- | src/declarative/qml/ftw/qdeclarativepool_p.h | 3 | ||||
| -rw-r--r-- | src/declarative/qml/ftw/qfastmetabuilder_p.h | 2 | ||||
| -rw-r--r-- | src/declarative/qml/ftw/qhashedstring_p.h | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/declarative/qml/ftw/qdeclarativepool_p.h b/src/declarative/qml/ftw/qdeclarativepool_p.h index 8935046cc3..c4393fe2e6 100644 --- a/src/declarative/qml/ftw/qdeclarativepool_p.h +++ b/src/declarative/qml/ftw/qdeclarativepool_p.h @@ -58,7 +58,8 @@ QT_BEGIN_NAMESPACE -class QDeclarativePool +// Exported for QtQuick1 +class Q_DECLARATIVE_EXPORT QDeclarativePool { public: // The class has a destructor that needs to be called diff --git a/src/declarative/qml/ftw/qfastmetabuilder_p.h b/src/declarative/qml/ftw/qfastmetabuilder_p.h index 9a6971d652..e9457b5943 100644 --- a/src/declarative/qml/ftw/qfastmetabuilder_p.h +++ b/src/declarative/qml/ftw/qfastmetabuilder_p.h @@ -122,7 +122,7 @@ public: QByteArray toData() const { return m_data; } static void fromData(QMetaObject *, const QMetaObject *parent, const QByteArray &); private: - friend class StringRef; + friend struct StringRef; QByteArray m_data; int m_zeroPtr; diff --git a/src/declarative/qml/ftw/qhashedstring_p.h b/src/declarative/qml/ftw/qhashedstring_p.h index f6c7f20d3a..d0dada8d72 100644 --- a/src/declarative/qml/ftw/qhashedstring_p.h +++ b/src/declarative/qml/ftw/qhashedstring_p.h @@ -254,7 +254,7 @@ public: } }; -struct Q_AUTOTEST_EXPORT QStringHashData +class Q_AUTOTEST_EXPORT QStringHashData { public: QStringHashData() @@ -275,7 +275,7 @@ private: }; template<class T, int SmallThreshold = 0> -class Q_AUTOTEST_EXPORT QStringHash +class QStringHash { public: struct Node : public QStringHashNode { |