diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-06 05:58:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-06 05:58:48 (GMT) |
| commit | cb85dd1db4e42b35fd3727874d718389238b801f (patch) | |
| tree | 2e7967d4d6ab6e49cd2786e85a4af9ca279f4814 /src/declarative/qml | |
| parent | af60a29d79bca27dde9441b6b8fc0eae185f08d5 (diff) | |
| parent | 51381e1454070960bc3c1d6acdfa8e742c37620c (diff) | |
| download | Qt-cb85dd1db4e42b35fd3727874d718389238b801f.zip Qt-cb85dd1db4e42b35fd3727874d718389238b801f.tar.gz Qt-cb85dd1db4e42b35fd3727874d718389238b801f.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Labs (experimental) Gesture support.
Diffstat (limited to 'src/declarative/qml')
| -rw-r--r-- | src/declarative/qml/qdeclarativeparser_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeparser_p.h b/src/declarative/qml/qdeclarativeparser_p.h index fd3e22f..57df04c 100644 --- a/src/declarative/qml/qdeclarativeparser_p.h +++ b/src/declarative/qml/qdeclarativeparser_p.h @@ -237,7 +237,7 @@ namespace QDeclarativeParser QList<DynamicSlot> dynamicSlots; }; - class Variant + class Q_DECLARATIVE_EXPORT Variant { public: enum Type { |