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

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3377 commits)
  Expect fail.
  Expect fails.
  Attempt to clairify highlight range docs
  Make sure item release isn't deferred indefinately
  Expect fail.
  Missing file
  Exclude plugins example in test.
  Test
  Crash
  Fix tests
  Compile.
  Remove pathview test.
  Remove unneeded
  Fix repeater test.
  Revert "Remove unimplemented methods from header"
  Revert "Replace QList<>* support with QmlListProperty"
  Revert "Compile"
  Add expected fail and created QTBUG-8072 for qml animation auto-test
  Fix expected error message.
  Consolidate the two pathview tests and fix them all.
  ...

1 files changed, 3 insertions, 2 deletions

diff --git a/src/gui/widgets/qvalidator.h b/src/gui/widgets/qvalidator.h
index e996a01..63734ca 100644
--- a/src/gui/widgets/qvalidator.h
+++ b/src/gui/widgets/qvalidator.h
@@ -137,10 +137,11 @@ class Q_GUI_EXPORT QDoubleValidator : public QValidator
     Q_PROPERTY(double bottom READ bottom WRITE setBottom)
     Q_PROPERTY(double top READ top WRITE setTop)
     Q_PROPERTY(int decimals READ decimals WRITE setDecimals)
+    Q_ENUMS(Notation)
     Q_PROPERTY(Notation notation READ notation WRITE setNotation)
 
 public:
-    explicit QDoubleValidator(QObject * parent);
+    explicit QDoubleValidator(QObject * parent = 0);
     QDoubleValidator(double bottom, double top, int decimals, QObject * parent);
     ~QDoubleValidator();
 
@@ -184,7 +185,7 @@ class Q_GUI_EXPORT QRegExpValidator : public QValidator
     Q_PROPERTY(QRegExp regExp READ regExp WRITE setRegExp)
 
 public:
-    explicit QRegExpValidator(QObject *parent);
+    explicit QRegExpValidator(QObject *parent = 0);
     QRegExpValidator(const QRegExp& rx, QObject *parent);
     ~QRegExpValidator();