diff options
| author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2010-05-23 17:51:22 (GMT) |
|---|---|---|
| committer | Andreas Kling <andreas.kling@nokia.com> | 2010-05-23 17:52:27 (GMT) |
| commit | b827967fef469f66a5a2f975bfafc3cdb82c4ffb (patch) | |
| tree | 28933364d5777426bccd1cbe1d3ed2fd97fb4f1c /src | |
| parent | 3d96cbd2ec0c104a77254219ef583b6ade3c547d (diff) | |
| download | Qt-b827967fef469f66a5a2f975bfafc3cdb82c4ffb.zip Qt-b827967fef469f66a5a2f975bfafc3cdb82c4ffb.tar.gz Qt-b827967fef469f66a5a2f975bfafc3cdb82c4ffb.tar.bz2 | |
Compile with QT_NO_ACTION.
Merge-request: 643
Reviewed-by: Andreas Kling <andreas.kling@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp index 7c55009..151a9e9 100644 --- a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp @@ -140,7 +140,9 @@ void QDeclarativeItemModule::defineModule() qmlRegisterType<QDeclarativeScaleGrid>(); qmlRegisterType<QValidator>(); qmlRegisterType<QDeclarativeVisualModel>(); +#ifndef QT_NO_ACTION qmlRegisterType<QAction>(); +#endif qmlRegisterType<QDeclarativePen>(); qmlRegisterType<QDeclarativeFlickableVisibleArea>(); #ifndef QT_NO_GRAPHICSEFFECT |