diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-06-10 12:34:54 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-06-10 12:34:54 (GMT) |
| commit | d8a284783b56e2ddbcedff3fc9577ec6038aab57 (patch) | |
| tree | 1d49be6cb7de25836957adf30ac113c3a0499911 /src/declarative/fx/qfxcontentwrapper_p.h | |
| parent | 4a6548b83a6f1df42b82664efaca26c7efbc1909 (diff) | |
| parent | c0bbe44ab6290dee088138c01724779026d2c033 (diff) | |
| download | Qt-d8a284783b56e2ddbcedff3fc9577ec6038aab57.zip Qt-d8a284783b56e2ddbcedff3fc9577ec6038aab57.tar.gz Qt-d8a284783b56e2ddbcedff3fc9577ec6038aab57.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/corelib/animation/qanimationgroup.cpp
src/gui/graphicsview/qgraphicsitem.cpp
Diffstat (limited to 'src/declarative/fx/qfxcontentwrapper_p.h')
| -rw-r--r-- | src/declarative/fx/qfxcontentwrapper_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/fx/qfxcontentwrapper_p.h b/src/declarative/fx/qfxcontentwrapper_p.h index 4f42e00..a75fa1e 100644 --- a/src/declarative/fx/qfxcontentwrapper_p.h +++ b/src/declarative/fx/qfxcontentwrapper_p.h @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE class QFxContentWrapperPrivate : public QFxItemPrivate { - Q_DECLARE_PUBLIC(QFxContentWrapper); + Q_DECLARE_PUBLIC(QFxContentWrapper) public: QFxContentWrapperPrivate() { } |