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

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (42 commits)
  Update on color change.
  Update on color change.
  Add go button to webbrowser example.
  Remove 'XXX Experimental' from VisualItemModel/VisualDataModel and
  Document attached properties
  Add 'on' prefix to documentation of signals
  Stablize qmlviewer test
  Improve test stability.
  qmlviewer: ensure that only clicks on the current file list are handled.
  Doc improvements: move some example code to snippets, add screenshots,
  Move some example code into snippets/ and add other doc fixes
  Fix crash when changing ListView model with highlightRangeMode: ListView.StrictlyEnforceRange
  Fix GridView bounds behavior with snapping enabled.
  Small optimization when checking if MouseArea's onPressAndHold is
  Fix autotest.
  Fixed `nmake clean' breaking declarative imports on Windows.
  Fix drawing flicker on Qml Viewer startup
  Fix snake demo
  Add qmlmethod Item::childAt() to delarative item
  Cursor positioning in QTextDocument after undo()
  ...

1 files changed, 2 insertions, 0 deletions

diff --git a/src/declarative/qml/qdeclarativevaluetype_p.h b/src/declarative/qml/qdeclarativevaluetype_p.h
index 3eaecc1c37..4b1bbd621b 100644
--- a/src/declarative/qml/qdeclarativevaluetype_p.h
+++ b/src/declarative/qml/qdeclarativevaluetype_p.h
@@ -55,6 +55,7 @@
 
 #include "qdeclarativeproperty.h"
 #include "private/qdeclarativeproperty_p.h"
+#include "private/qdeclarativenullablevalue_p_p.h"
 
 #include <QtCore/qobject.h>
 #include <QtCore/qrect.h>
@@ -547,6 +548,7 @@ private:
     QFont font;
     bool pixelSizeSet;
     bool pointSizeSet;
+    mutable QDeclarativeNullableValue<int> dpi;
 };
 
 QT_END_NAMESPACE