From b827967fef469f66a5a2f975bfafc3cdb82c4ffb Mon Sep 17 00:00:00 2001
From: Tasuku Suzuki <tasuku.suzuki@nokia.com>
Date: Sun, 23 May 2010 19:51:22 +0200
Subject: Compile with QT_NO_ACTION.

Merge-request: 643
Reviewed-by: Andreas Kling <andreas.kling@nokia.com>
---
 src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp | 2 ++
 1 file changed, 2 insertions(+)

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
-- 
cgit v0.12