Merge branch 'refactor'

[profile/ivi/qtdeclarative.git] / src / declarative / items / qsgitemsmodule.cpp

diff --git a/src/declarative/items/qsgitemsmodule.cpp b/src/declarative/items/qsgitemsmodule.cpp
index 6d94085..2ad7e59 100644 (file)
--- a/src/declarative/items/qsgitemsmodule.cpp
+++ b/src/declarative/items/qsgitemsmodule.cpp
@@ -130,7 +130,8 @@ static void qt_sgitems_defineModule(const char *uri, int major, int minor)
     qmlRegisterType<QDeclarativePathArc>("QtQuick",2,0,"PathArc");
     qmlRegisterType<QDeclarativePathSvg>("QtQuick",2,0,"PathSvg");
     qmlRegisterType<QSGPathView>(uri,major,minor,"PathView");
-    qmlRegisterUncreatableType<QSGBasePositioner>(uri,major,minor,"Positioner","Positioner is an abstract type that is only available as an attached property.");
+    qmlRegisterUncreatableType<QSGBasePositioner>(uri,major,minor,"Positioner",
+                                                  QStringLiteral("Positioner is an abstract type that is only available as an attached property."));
 #ifndef QT_NO_VALIDATOR
     qmlRegisterType<QIntValidator>(uri,major,minor,"IntValidator");
     qmlRegisterType<QDoubleValidator>(uri,major,minor,"DoubleValidator");
@@ -160,9 +161,6 @@ static void qt_sgitems_defineModule(const char *uri, int major, int minor)
     qmlRegisterType<QValidator>();
 #endif
     qmlRegisterType<QSGVisualModel>();
-#ifndef QT_NO_ACTION
-    qmlRegisterType<QAction>();
-#endif
     qmlRegisterType<QSGPen>();
     qmlRegisterType<QSGFlickableVisibleArea>();
     qRegisterMetaType<QSGAnchorLine>("QSGAnchorLine");