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.
  ...

8 files changed, 44 insertions, 1 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
index 32a6321..a05e426 100644
--- a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
@@ -263,7 +263,9 @@ void QDeclarativeAnimatedImage::movieRequestFinished()
 
     d->_movie = new QMovie(d->reply);
     if (!d->_movie->isValid()){
+#ifndef QT_NO_DEBUG_STREAM
         qmlInfo(this) << "Error Reading Animated Image File " << d->url;
+#endif
         delete d->_movie;
         d->_movie = 0;
         return;
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index 7bd08ce..134bd6d 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -3131,6 +3131,7 @@ bool QDeclarativeItem::event(QEvent *ev)
     return QGraphicsObject::event(ev);
 }
 
+#ifndef QT_NO_DEBUG_STREAM
 QDebug operator<<(QDebug debug, QDeclarativeItem *item)
 {
     if (!item) {
@@ -3144,6 +3145,7 @@ QDebug operator<<(QDebug debug, QDeclarativeItem *item)
           << ", z =" << item->zValue() << ')';
     return debug;
 }
+#endif
 
 qint64 QDeclarativeItemPrivate::consistentTime = -1;
 void QDeclarativeItemPrivate::setConsistentTime(qint64 t)
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.h b/src/declarative/graphicsitems/qdeclarativeitem.h
index 29fd241..77e316b 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.h
+++ b/src/declarative/graphicsitems/qdeclarativeitem.h
@@ -209,7 +209,9 @@ T qobject_cast(QGraphicsItem *item)
     return qobject_cast<T>(o);
 }
 
+#ifndef QT_NO_DEBUG_STREAM
 QDebug Q_DECLARATIVE_EXPORT operator<<(QDebug debug, QDeclarativeItem *item);
+#endif
 
 QT_END_NAMESPACE
 
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>();
diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp
index 2c1eb67..55cef8b 100644
--- a/src/declarative/graphicsitems/qdeclarativetext.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetext.cpp
@@ -318,7 +318,11 @@ void QDeclarativeText::setText(const QString &n)
     if (d->richText) {
         if (isComponentComplete()) {
             d->ensureDoc();
+#ifndef QT_NO_TEXTHTMLPARSER
             d->doc->setHtml(n);
+#else
+            d->doc->setPlainText(n);
+#endif
         }
     }
 
@@ -605,7 +609,11 @@ void QDeclarativeText::setTextFormat(TextFormat format)
     } else if (!wasRich && d->richText) {
         if (isComponentComplete()) {
             d->ensureDoc();
+#ifndef QT_NO_TEXTHTMLPARSER
             d->doc->setHtml(d->text);
+#else
+            d->doc->setPlainText(d->text);
+#endif
         }
         d->updateLayout();
         d->markImgDirty();
@@ -991,7 +999,11 @@ void QDeclarativeText::reloadWithResources()
     Q_D(QDeclarativeText);
     if (!d->richText)
         return;
+#ifndef QT_NO_TEXTHTMLPARSER
     d->doc->setHtml(d->text);
+#else
+    d->doc->setPlainText(d->text);
+#endif
     d->updateLayout();
     d->markImgDirty();
 }
@@ -1121,7 +1133,11 @@ void QDeclarativeText::componentComplete()
     if (d->dirty) {
         if (d->richText) {
             d->ensureDoc();
+#ifndef QT_NO_TEXTHTMLPARSER
             d->doc->setHtml(d->text);
+#else
+            d->doc->setPlainText(d->text);
+#endif
         }
         d->updateLayout();
         d->dirty = false;
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
index f8876f2..15cdb05 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
@@ -127,9 +127,11 @@ QString QDeclarativeTextEdit::text() const
 {
     Q_D(const QDeclarativeTextEdit);
 
+#ifndef QT_NO_TEXTHTMLPARSER
     if (d->richText)
         return d->document->toHtml();
     else
+#endif
         return d->document->toPlainText();
 }
 
@@ -260,7 +262,11 @@ void QDeclarativeTextEdit::setText(const QString &text)
     d->text = text;
     d->richText = d->format == RichText || (d->format == AutoText && Qt::mightBeRichText(text));
     if (d->richText) {
+#ifndef QT_NO_TEXTHTMLPARSER
         d->control->setHtml(text);
+#else
+        d->control->setPlainText(text);
+#endif
     } else {
         d->control->setPlainText(text);
     }
@@ -325,7 +331,11 @@ void QDeclarativeTextEdit::setTextFormat(TextFormat format)
         d->control->setPlainText(d->text);
         updateSize();
     } else if (!wasRich && d->richText) {
+#ifndef QT_NO_TEXTHTMLPARSER
         d->control->setHtml(d->text);
+#else
+        d->control->setPlainText(d->text);
+#endif
         updateSize();
     }
     d->format = format;
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index 9a6a070..ea958ef 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -648,6 +648,7 @@ void QDeclarativeTextInput::setAutoScroll(bool b)
 
     \sa acceptableInput, inputMask
 */
+#ifndef QT_NO_VALIDATOR
 QValidator* QDeclarativeTextInput::validator() const
 {
     Q_D(const QDeclarativeTextInput);
@@ -669,6 +670,7 @@ void QDeclarativeTextInput::setValidator(QValidator* v)
 
     emit validatorChanged();
 }
+#endif // QT_NO_VALIDATOR
 
 /*!
     \qmlproperty string TextInput::inputMask
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput_p.h b/src/declarative/graphicsitems/qdeclarativetextinput_p.h
index 6bb94c2..9d58f13 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetextinput_p.h
@@ -79,7 +79,9 @@ class Q_DECLARATIVE_EXPORT QDeclarativeTextInput : public QDeclarativePaintedIte
     Q_PROPERTY(QString selectedText READ selectedText NOTIFY selectedTextChanged)
 
     Q_PROPERTY(int maximumLength READ maxLength WRITE setMaxLength NOTIFY maximumLengthChanged)
+#ifndef QT_NO_VALIDATOR
     Q_PROPERTY(QValidator* validator READ validator WRITE setValidator NOTIFY validatorChanged)
+#endif
     Q_PROPERTY(QString inputMask READ inputMask WRITE setInputMask NOTIFY inputMaskChanged)
     Q_PROPERTY(Qt::InputMethodHints inputMethodHints READ inputMethodHints WRITE setInputMethodHints)
 
@@ -156,9 +158,10 @@ public:
     int maxLength() const;
     void setMaxLength(int ml);
 
+#ifndef QT_NO_VALIDATOR
     QValidator * validator() const;
     void setValidator(QValidator* v);
-
+#endif
     QString inputMask() const;
     void setInputMask(const QString &im);
 
@@ -248,10 +251,12 @@ private:
 QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeTextInput)
+#ifndef QT_NO_VALIDATOR
 QML_DECLARE_TYPE(QValidator)
 QML_DECLARE_TYPE(QIntValidator)
 QML_DECLARE_TYPE(QDoubleValidator)
 QML_DECLARE_TYPE(QRegExpValidator)
+#endif
 
 QT_END_HEADER