Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (21 commits)
  Doc: Fixed an off-by-one error in an example.
  Fix QT_NO_TEXTHTMLPARSER
  Fix QT_NO_DOM
  Fix QT_NO_TEXTSTREAM compilation errors.
  Fix QT_NO_VALIDATOR compilation.
  Doc: Removed a misleading sentence about a class constructor.
  Doc: correcting docs in QDrag::exec
  Doc: Adding note about  QDrag::exec()
  Revert behavior of QTextLayout::boundingRect() when line width is set
  Fix unreasonably large width of QTextLayout::boundingRect()
  Doc: replacing old image
  Fix compilation with stricts compilers.
  Fix QT_NO_DIRMODEL build error in QtDeclarative.
  Revert "Added native key support to QSharedMemory API."
  Revert "Improved documentation for QSharedMemory's key/setKey functions."
  Fix a simple mistake in QXmlStreamReader::atEnd() docs.
  Improved documentation for QSharedMemory's key/setKey functions.
  Added native key support to QSharedMemory API.
  Make test work with shadow builds again.
  Doc: Corrected the documentation about the compression threshold.
  ...

1 files changed, 4 insertions, 0 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
index 151a9e9..0be8dac 100644
--- a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
@@ -112,9 +112,11 @@ void QDeclarativeItemModule::defineModule()
     qmlRegisterType<QDeclarativePathPercent>("Qt",4,7,"PathPercent");
     qmlRegisterType<QDeclarativePathQuad>("Qt",4,7,"PathQuad");
     qmlRegisterType<QDeclarativePathView>("Qt",4,7,"PathView");
+#ifndef QT_NO_VALIDATOR
     qmlRegisterType<QIntValidator>("Qt",4,7,"IntValidator");
     qmlRegisterType<QDoubleValidator>("Qt",4,7,"DoubleValidator");
     qmlRegisterType<QRegExpValidator>("Qt",4,7,"RegExpValidator");
+#endif
     qmlRegisterType<QDeclarativeRectangle>("Qt",4,7,"Rectangle");
     qmlRegisterType<QDeclarativeRepeater>("Qt",4,7,"Repeater");
     qmlRegisterType<QGraphicsRotation>("Qt",4,7,"Rotation");
@@ -138,7 +140,9 @@ void QDeclarativeItemModule::defineModule()
     qmlRegisterType<QDeclarativePathElement>();
     qmlRegisterType<QDeclarativeCurve>();
     qmlRegisterType<QDeclarativeScaleGrid>();
+#ifndef QT_NO_VALIDATOR
     qmlRegisterType<QValidator>();
+#endif
     qmlRegisterType<QDeclarativeVisualModel>();
 #ifndef QT_NO_ACTION
     qmlRegisterType<QAction>();