7 files changed, 11 insertions, 11 deletions
diff --git a/src/gui/util/qabstractlayoutstyleinfo_p.h b/src/gui/util/qabstractlayoutstyleinfo_p.h
index b8f3825ada..bf1e1fc852 100644
--- a/src/gui/util/qabstractlayoutstyleinfo_p.h
+++ b/src/gui/util/qabstractlayoutstyleinfo_p.h
@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtGui/private/qtguiglobal_p.h>
 #include <QtCore/qnamespace.h>
 #include "qlayoutpolicy_p.h"
 
diff --git a/src/gui/util/qdesktopservices.h b/src/gui/util/qdesktopservices.h
index 3d44ab4a1e..21705e2757 100644
--- a/src/gui/util/qdesktopservices.h
+++ b/src/gui/util/qdesktopservices.h
@@ -40,6 +40,7 @@
 #ifndef QDESKTOPSERVICES_H
 #define QDESKTOPSERVICES_H
 
+#include <QtGui/qtguiglobal.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qstandardpaths.h>
 
diff --git a/src/gui/util/qgridlayoutengine_p.h b/src/gui/util/qgridlayoutengine_p.h
index d79d4cc9c9..5f0cc5da73 100644
--- a/src/gui/util/qgridlayoutengine_p.h
+++ b/src/gui/util/qgridlayoutengine_p.h
@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtGui/private/qtguiglobal_p.h>
 #include "qalgorithms.h"
 #include "qbitarray.h"
 #include "qlist.h"
diff --git a/src/gui/util/qhexstring_p.h b/src/gui/util/qhexstring_p.h
index ac11c8ad14..511eec0f1b 100644
--- a/src/gui/util/qhexstring_p.h
+++ b/src/gui/util/qhexstring_p.h
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include <QtCore/qglobal.h>
+#include <QtGui/private/qtguiglobal_p.h>
 #include <QtCore/qpoint.h>
 #include <QtCore/qstring.h>
 #include <QtGui/qpolygon.h>
diff --git a/src/gui/util/qlayoutpolicy_p.h b/src/gui/util/qlayoutpolicy_p.h
index 979b808563..a729a57e8b 100644
--- a/src/gui/util/qlayoutpolicy_p.h
+++ b/src/gui/util/qlayoutpolicy_p.h
@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtGui/private/qtguiglobal_p.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qnamespace.h>
 
diff --git a/src/gui/util/qvalidator.cpp b/src/gui/util/qvalidator.cpp
index 90c6e7a7b8..fb9dfc9f69 100644
--- a/src/gui/util/qvalidator.cpp
+++ b/src/gui/util/qvalidator.cpp
@@ -216,7 +216,7 @@ public:
 */
 
 QValidator::QValidator(QObject * parent)
-    : QObject(*new QValidatorPrivate, parent)
+    : QValidator(*new QValidatorPrivate, parent)
 {
 }
 
@@ -337,10 +337,8 @@ void QValidator::fixup(QString &) const
 */
 
 QIntValidator::QIntValidator(QObject * parent)
-    : QValidator(parent)
+    : QIntValidator(INT_MIN, INT_MAX, parent)
 {
-    b = INT_MIN;
-    t = INT_MAX;
 }
 
 
@@ -589,11 +587,8 @@ public:
 */
 
 QDoubleValidator::QDoubleValidator(QObject * parent)
-    : QValidator(*new QDoubleValidatorPrivate , parent)
+    : QDoubleValidator(-HUGE_VAL, HUGE_VAL, 1000, parent)
 {
-    b = -HUGE_VAL;
-    t = HUGE_VAL;
-    dec = 1000;
 }
 
 
@@ -845,7 +840,7 @@ QDoubleValidator::Notation QDoubleValidator::notation() const
 */
 
 QRegExpValidator::QRegExpValidator(QObject *parent)
-    : QValidator(parent), r(QString::fromLatin1(".*"))
+    : QRegExpValidator(QRegExp(QString::fromLatin1(".*")), parent)
 {
 }
 
@@ -982,7 +977,7 @@ QRegularExpressionValidator::QRegularExpressionValidator(QObject *parent)
 */
 
 QRegularExpressionValidator::QRegularExpressionValidator(const QRegularExpression &re, QObject *parent)
-    : QValidator(*new QRegularExpressionValidatorPrivate, parent)
+    : QRegularExpressionValidator(parent)
 {
     Q_D(QRegularExpressionValidator);
     d->setRegularExpression(re);
diff --git a/src/gui/util/qvalidator.h b/src/gui/util/qvalidator.h
index 85787a66c6..eba4b54672 100644
--- a/src/gui/util/qvalidator.h
+++ b/src/gui/util/qvalidator.h
@@ -41,6 +41,7 @@
 #ifndef QVALIDATOR_H
 #define QVALIDATOR_H
 
+#include <QtGui/qtguiglobal.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qregexp.h>