From 4cde796ae856c9598397e496ddcbc9292326a1f0 Mon Sep 17 00:00:00 2001
From: hpcdgrie <grieger@hlrs.de>
Date: Thu, 5 Jan 2023 10:58:16 +0100
Subject: [PATCH] Replaced depracated interfaces to compile with Qt6

This mostly contains:
QRegExp ->QRegularExpression
QRegExpValidator -> QRegularExpressionValidator
QStyleOptionViewItemVX -> QStyleOptionViewItem
qVariantValue<> -> QVariant.value<>
qFindChildren -> QtVariantPropertyManager.findChildren
---
 .../doc/html/qtlockedfile-members.html        |   2 +-
 .../html/qtabstracteditorfactory-members.html |   2 +-
 .../qtabstracteditorfactorybase-members.html  |   2 +-
 .../qtabstractpropertybrowser-members.html    |   2 +-
 .../qtabstractpropertymanager-members.html    |   2 +-
 .../html/qtboolpropertymanager-members.html   |   2 +-
 .../html/qtbuttonpropertybrowser-members.html |   2 +-
 .../doc/html/qtchareditorfactory-members.html |   2 +-
 .../html/qtcharpropertymanager-members.html   |   2 +-
 .../doc/html/qtcheckboxfactory-members.html   |   2 +-
 .../html/qtcoloreditorfactory-members.html    |   2 +-
 .../html/qtcolorpropertymanager-members.html  |   2 +-
 .../html/qtcursoreditorfactory-members.html   |   2 +-
 .../html/qtcursorpropertymanager-members.html |   2 +-
 .../doc/html/qtdateeditfactory-members.html   |   2 +-
 .../html/qtdatepropertymanager-members.html   |   2 +-
 .../html/qtdatetimeeditfactory-members.html   |   2 +-
 .../qtdatetimepropertymanager-members.html    |   2 +-
 .../html/qtdoublepropertymanager-members.html |   2 +-
 .../html/qtdoublespinboxfactory-members.html  |   2 +-
 .../doc/html/qtenumeditorfactory-members.html |   2 +-
 .../html/qtenumpropertymanager-members.html   |   2 +-
 .../html/qtflagpropertymanager-members.html   |   2 +-
 .../doc/html/qtfonteditorfactory-members.html |   2 +-
 .../html/qtfontpropertymanager-members.html   |   2 +-
 .../qtgroupboxpropertybrowser-members.html    |   2 +-
 .../html/qtgrouppropertymanager-members.html  |   2 +-
 .../html/qtintpropertymanager-members.html    |   2 +-
 .../qtkeysequenceeditorfactory-members.html   |   2 +-
 .../qtkeysequencepropertymanager-members.html |   2 +-
 .../doc/html/qtlineeditfactory-members.html   |   2 +-
 .../html/qtlocalepropertymanager-members.html |   2 +-
 .../html/qtpointfpropertymanager-members.html |   2 +-
 .../html/qtpointpropertymanager-members.html  |   2 +-
 .../doc/html/qtpropertybrowser.index          |  10 +-
 .../html/qtrectfpropertymanager-members.html  |   2 +-
 .../html/qtrectpropertymanager-members.html   |   2 +-
 .../doc/html/qtscrollbarfactory-members.html  |   2 +-
 .../html/qtsizefpropertymanager-members.html  |   2 +-
 .../qtsizepolicypropertymanager-members.html  |   2 +-
 .../html/qtsizepropertymanager-members.html   |   2 +-
 .../doc/html/qtsliderfactory-members.html     |   2 +-
 .../doc/html/qtspinboxfactory-members.html    |   2 +-
 .../html/qtstringpropertymanager-members.html |   8 +-
 .../doc/html/qtstringpropertymanager.html     |  12 +-
 .../doc/html/qttimeeditfactory-members.html   |   2 +-
 .../html/qttimepropertymanager-members.html   |   2 +-
 .../html/qttreepropertybrowser-members.html   |   2 +-
 .../html/qtvarianteditorfactory-members.html  |   2 +-
 .../qtvariantpropertymanager-members.html     |   2 +-
 qtpropertybrowser/src/qteditorfactory.cpp     |  35 ++-
 qtpropertybrowser/src/qteditorfactory.h       |   2 +-
 .../src/qtpropertybrowserutils.cpp            |   6 +-
 qtpropertybrowser/src/qtpropertymanager.cpp   |  16 +-
 qtpropertybrowser/src/qtpropertymanager.h     |   7 +-
 .../src/qttreepropertybrowser.cpp             |  16 +-
 qtpropertybrowser/src/qtvariantproperty.cpp   | 202 +++++++++---------
 qtpropertybrowser/src/qtvariantproperty.h     |   2 +-
 .../doc/html/qscriptengine-members.html       |   4 +-
 qtscriptclassic/doc/html/qscriptengine.html   |   4 +-
 .../html/qscriptextensionplugin-members.html  |   2 +-
 .../doc/html/qscriptvalue-members.html        |   2 +-
 qtscriptclassic/doc/html/qscriptvalue.html    |   6 +-
 .../doc/html/qtscriptclassic.index            |   6 +-
 qtscriptclassic/src/qscriptcontext_p.cpp      |   4 +-
 qtscriptclassic/src/qscriptecmadate.cpp       |   2 +-
 qtscriptclassic/src/qscriptecmaregexp.cpp     |  18 +-
 qtscriptclassic/src/qscriptecmaregexp_p.h     |  14 +-
 qtscriptclassic/src/qscriptengine.cpp         |   2 +-
 qtscriptclassic/src/qscriptengine.h           |   4 +-
 qtscriptclassic/src/qscriptengine_p.cpp       |  10 +-
 qtscriptclassic/src/qscriptenginefwd_p.h      |   4 +-
 qtscriptclassic/src/qscriptextqobject.cpp     |   6 +-
 qtscriptclassic/src/qscriptvalue.cpp          |  10 +-
 qtscriptclassic/src/qscriptvalue.h            |   4 +-
 qtscriptclassic/src/qscriptvalueimpl_p.h      |   4 +-
 qtscriptclassic/src/qscriptvalueimplfwd_p.h   |   2 +-
 .../doc/html/qtservice-example-server.html    |   2 +-
 qtservice/examples/server/main.cpp            |   2 +-
 .../doc/html/qtsingleapplication-members.html |   2 +-
 .../html/qtsinglecoreapplication-members.html |   2 +-
 .../doc/html/qtsoaphttptransport-members.html |   2 +-
 qtwinmigrate/doc/html/qmfcapp-members.html    |   2 +-
 qtwinmigrate/doc/html/qwinhost-members.html   |   2 +-
 qtwinmigrate/doc/html/qwinwidget-members.html |   2 +-
 85 files changed, 267 insertions(+), 267 deletions(-)

diff --git a/qtlockedfile/doc/html/qtlockedfile-members.html b/qtlockedfile/doc/html/qtlockedfile-members.html
index ef33d29c..adf7479c 100644
--- a/qtlockedfile/doc/html/qtlockedfile-members.html
+++ b/qtlockedfile/doc/html/qtlockedfile-members.html
@@ -67,7 +67,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qfile.html#fileName">fileName</a></b> () const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qfile.html#flush">flush</a></b> ()</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qiodevice.html#getChar">getChar</a></b> ( char * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qfile.html#handle">handle</a></b> () const</div></li>
diff --git a/qtpropertybrowser/doc/html/qtabstracteditorfactory-members.html b/qtpropertybrowser/doc/html/qtabstracteditorfactory-members.html
index 204d8b11..c602a5be 100644
--- a/qtpropertybrowser/doc/html/qtabstracteditorfactory-members.html
+++ b/qtpropertybrowser/doc/html/qtabstracteditorfactory-members.html
@@ -44,7 +44,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
 </ul></td><td valign="top"><ul>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#installEventFilter">installEventFilter</a></b> ( QObject * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#isWidgetType">isWidgetType</a></b> () const</div></li>
diff --git a/qtpropertybrowser/doc/html/qtabstracteditorfactorybase-members.html b/qtpropertybrowser/doc/html/qtabstracteditorfactorybase-members.html
index 973a10e2..98f4db8e 100644
--- a/qtpropertybrowser/doc/html/qtabstracteditorfactorybase-members.html
+++ b/qtpropertybrowser/doc/html/qtabstracteditorfactorybase-members.html
@@ -39,7 +39,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#eventFilter">eventFilter</a></b> ( QObject *, QEvent * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 </ul></td><td valign="top"><ul>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#installEventFilter">installEventFilter</a></b> ( QObject * )</div></li>
diff --git a/qtpropertybrowser/doc/html/qtabstractpropertybrowser-members.html b/qtpropertybrowser/doc/html/qtabstractpropertybrowser-members.html
index d3fcbe74..7d2febae 100644
--- a/qtpropertybrowser/doc/html/qtabstractpropertybrowser-members.html
+++ b/qtpropertybrowser/doc/html/qtabstractpropertybrowser-members.html
@@ -86,7 +86,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qwidget.html#find">find</a></b> ( WId )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qwidget.html#focusInEvent">focusInEvent</a></b> ( QFocusEvent * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qwidget.html#focusNextChild">focusNextChild</a></b> ()</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qwidget.html#focusNextPrevChild">focusNextPrevChild</a></b> ( bool )</div></li>
diff --git a/qtpropertybrowser/doc/html/qtabstractpropertymanager-members.html b/qtpropertybrowser/doc/html/qtabstractpropertymanager-members.html
index 760f91da..eb1c2ecd 100644
--- a/qtpropertybrowser/doc/html/qtabstractpropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtabstractpropertymanager-members.html
@@ -42,7 +42,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#eventFilter">eventFilter</a></b> ( QObject *, QEvent * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="qtabstractpropertymanager.html#hasValue">hasValue</a></b> ( const QtProperty * ) const : bool</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="qtabstractpropertymanager.html#initializeProperty">initializeProperty</a></b> ( QtProperty * )</div></li>
diff --git a/qtpropertybrowser/doc/html/qtboolpropertymanager-members.html b/qtpropertybrowser/doc/html/qtboolpropertymanager-members.html
index f32b2e7c..c0651887 100644
--- a/qtpropertybrowser/doc/html/qtboolpropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtboolpropertymanager-members.html
@@ -42,7 +42,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#eventFilter">eventFilter</a></b> ( QObject *, QEvent * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="qtabstractpropertymanager.html#hasValue">hasValue</a></b> ( const QtProperty * ) const : bool</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="qtboolpropertymanager.html#initializeProperty">initializeProperty</a></b> ( QtProperty * )</div></li>
diff --git a/qtpropertybrowser/doc/html/qtbuttonpropertybrowser-members.html b/qtpropertybrowser/doc/html/qtbuttonpropertybrowser-members.html
index 2630e2c4..1b2a5950 100644
--- a/qtpropertybrowser/doc/html/qtbuttonpropertybrowser-members.html
+++ b/qtpropertybrowser/doc/html/qtbuttonpropertybrowser-members.html
@@ -88,7 +88,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qwidget.html#find">find</a></b> ( WId )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qwidget.html#focusInEvent">focusInEvent</a></b> ( QFocusEvent * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qwidget.html#focusNextChild">focusNextChild</a></b> ()</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qwidget.html#focusNextPrevChild">focusNextPrevChild</a></b> ( bool )</div></li>
diff --git a/qtpropertybrowser/doc/html/qtchareditorfactory-members.html b/qtpropertybrowser/doc/html/qtchareditorfactory-members.html
index 2999d660..576311b2 100644
--- a/qtpropertybrowser/doc/html/qtchareditorfactory-members.html
+++ b/qtpropertybrowser/doc/html/qtchareditorfactory-members.html
@@ -45,7 +45,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
 </ul></td><td valign="top"><ul>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#installEventFilter">installEventFilter</a></b> ( QObject * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#isWidgetType">isWidgetType</a></b> () const</div></li>
diff --git a/qtpropertybrowser/doc/html/qtcharpropertymanager-members.html b/qtpropertybrowser/doc/html/qtcharpropertymanager-members.html
index 6a5c45e6..c90577e7 100644
--- a/qtpropertybrowser/doc/html/qtcharpropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtcharpropertymanager-members.html
@@ -42,7 +42,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#eventFilter">eventFilter</a></b> ( QObject *, QEvent * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="qtabstractpropertymanager.html#hasValue">hasValue</a></b> ( const QtProperty * ) const : bool</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="qtcharpropertymanager.html#initializeProperty">initializeProperty</a></b> ( QtProperty * )</div></li>
diff --git a/qtpropertybrowser/doc/html/qtcheckboxfactory-members.html b/qtpropertybrowser/doc/html/qtcheckboxfactory-members.html
index 70b8219d..8b7f4cf1 100644
--- a/qtpropertybrowser/doc/html/qtcheckboxfactory-members.html
+++ b/qtpropertybrowser/doc/html/qtcheckboxfactory-members.html
@@ -45,7 +45,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
 </ul></td><td valign="top"><ul>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#installEventFilter">installEventFilter</a></b> ( QObject * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#isWidgetType">isWidgetType</a></b> () const</div></li>
diff --git a/qtpropertybrowser/doc/html/qtcoloreditorfactory-members.html b/qtpropertybrowser/doc/html/qtcoloreditorfactory-members.html
index 5ad22f08..6753c0a1 100644
--- a/qtpropertybrowser/doc/html/qtcoloreditorfactory-members.html
+++ b/qtpropertybrowser/doc/html/qtcoloreditorfactory-members.html
@@ -45,7 +45,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
 </ul></td><td valign="top"><ul>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#installEventFilter">installEventFilter</a></b> ( QObject * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#isWidgetType">isWidgetType</a></b> () const</div></li>
diff --git a/qtpropertybrowser/doc/html/qtcolorpropertymanager-members.html b/qtpropertybrowser/doc/html/qtcolorpropertymanager-members.html
index c365c638..d1be7892 100644
--- a/qtpropertybrowser/doc/html/qtcolorpropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtcolorpropertymanager-members.html
@@ -42,7 +42,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#eventFilter">eventFilter</a></b> ( QObject *, QEvent * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="qtabstractpropertymanager.html#hasValue">hasValue</a></b> ( const QtProperty * ) const : bool</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="qtcolorpropertymanager.html#initializeProperty">initializeProperty</a></b> ( QtProperty * )</div></li>
diff --git a/qtpropertybrowser/doc/html/qtcursoreditorfactory-members.html b/qtpropertybrowser/doc/html/qtcursoreditorfactory-members.html
index b8d1a003..617c776e 100644
--- a/qtpropertybrowser/doc/html/qtcursoreditorfactory-members.html
+++ b/qtpropertybrowser/doc/html/qtcursoreditorfactory-members.html
@@ -45,7 +45,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
 </ul></td><td valign="top"><ul>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#installEventFilter">installEventFilter</a></b> ( QObject * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#isWidgetType">isWidgetType</a></b> () const</div></li>
diff --git a/qtpropertybrowser/doc/html/qtcursorpropertymanager-members.html b/qtpropertybrowser/doc/html/qtcursorpropertymanager-members.html
index 37413fa6..f03f1299 100644
--- a/qtpropertybrowser/doc/html/qtcursorpropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtcursorpropertymanager-members.html
@@ -42,7 +42,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#eventFilter">eventFilter</a></b> ( QObject *, QEvent * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="qtabstractpropertymanager.html#hasValue">hasValue</a></b> ( const QtProperty * ) const : bool</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="qtcursorpropertymanager.html#initializeProperty">initializeProperty</a></b> ( QtProperty * )</div></li>
diff --git a/qtpropertybrowser/doc/html/qtdateeditfactory-members.html b/qtpropertybrowser/doc/html/qtdateeditfactory-members.html
index e5398ab2..57fb0db4 100644
--- a/qtpropertybrowser/doc/html/qtdateeditfactory-members.html
+++ b/qtpropertybrowser/doc/html/qtdateeditfactory-members.html
@@ -45,7 +45,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
 </ul></td><td valign="top"><ul>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#installEventFilter">installEventFilter</a></b> ( QObject * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#isWidgetType">isWidgetType</a></b> () const</div></li>
diff --git a/qtpropertybrowser/doc/html/qtdatepropertymanager-members.html b/qtpropertybrowser/doc/html/qtdatepropertymanager-members.html
index c7aa6ed4..2609df15 100644
--- a/qtpropertybrowser/doc/html/qtdatepropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtdatepropertymanager-members.html
@@ -42,7 +42,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#eventFilter">eventFilter</a></b> ( QObject *, QEvent * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="qtabstractpropertymanager.html#hasValue">hasValue</a></b> ( const QtProperty * ) const : bool</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="qtdatepropertymanager.html#initializeProperty">initializeProperty</a></b> ( QtProperty * )</div></li>
diff --git a/qtpropertybrowser/doc/html/qtdatetimeeditfactory-members.html b/qtpropertybrowser/doc/html/qtdatetimeeditfactory-members.html
index 604e8a87..99d03e2e 100644
--- a/qtpropertybrowser/doc/html/qtdatetimeeditfactory-members.html
+++ b/qtpropertybrowser/doc/html/qtdatetimeeditfactory-members.html
@@ -45,7 +45,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
 </ul></td><td valign="top"><ul>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#installEventFilter">installEventFilter</a></b> ( QObject * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#isWidgetType">isWidgetType</a></b> () const</div></li>
diff --git a/qtpropertybrowser/doc/html/qtdatetimepropertymanager-members.html b/qtpropertybrowser/doc/html/qtdatetimepropertymanager-members.html
index 2929cf42..a8f0ba2a 100644
--- a/qtpropertybrowser/doc/html/qtdatetimepropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtdatetimepropertymanager-members.html
@@ -42,7 +42,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#eventFilter">eventFilter</a></b> ( QObject *, QEvent * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="qtabstractpropertymanager.html#hasValue">hasValue</a></b> ( const QtProperty * ) const : bool</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="qtdatetimepropertymanager.html#initializeProperty">initializeProperty</a></b> ( QtProperty * )</div></li>
diff --git a/qtpropertybrowser/doc/html/qtdoublepropertymanager-members.html b/qtpropertybrowser/doc/html/qtdoublepropertymanager-members.html
index 2ea6b0b7..007b300e 100644
--- a/qtpropertybrowser/doc/html/qtdoublepropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtdoublepropertymanager-members.html
@@ -44,7 +44,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#eventFilter">eventFilter</a></b> ( QObject *, QEvent * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="qtabstractpropertymanager.html#hasValue">hasValue</a></b> ( const QtProperty * ) const : bool</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="qtdoublepropertymanager.html#initializeProperty">initializeProperty</a></b> ( QtProperty * )</div></li>
diff --git a/qtpropertybrowser/doc/html/qtdoublespinboxfactory-members.html b/qtpropertybrowser/doc/html/qtdoublespinboxfactory-members.html
index 92ea83a5..2755e2e1 100644
--- a/qtpropertybrowser/doc/html/qtdoublespinboxfactory-members.html
+++ b/qtpropertybrowser/doc/html/qtdoublespinboxfactory-members.html
@@ -45,7 +45,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
 </ul></td><td valign="top"><ul>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#installEventFilter">installEventFilter</a></b> ( QObject * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#isWidgetType">isWidgetType</a></b> () const</div></li>
diff --git a/qtpropertybrowser/doc/html/qtenumeditorfactory-members.html b/qtpropertybrowser/doc/html/qtenumeditorfactory-members.html
index c6615b25..6e316f4d 100644
--- a/qtpropertybrowser/doc/html/qtenumeditorfactory-members.html
+++ b/qtpropertybrowser/doc/html/qtenumeditorfactory-members.html
@@ -45,7 +45,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
 </ul></td><td valign="top"><ul>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#installEventFilter">installEventFilter</a></b> ( QObject * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#isWidgetType">isWidgetType</a></b> () const</div></li>
diff --git a/qtpropertybrowser/doc/html/qtenumpropertymanager-members.html b/qtpropertybrowser/doc/html/qtenumpropertymanager-members.html
index 4884a075..7b03a4e4 100644
--- a/qtpropertybrowser/doc/html/qtenumpropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtenumpropertymanager-members.html
@@ -46,7 +46,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#eventFilter">eventFilter</a></b> ( QObject *, QEvent * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="qtabstractpropertymanager.html#hasValue">hasValue</a></b> ( const QtProperty * ) const : bool</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="qtenumpropertymanager.html#initializeProperty">initializeProperty</a></b> ( QtProperty * )</div></li>
diff --git a/qtpropertybrowser/doc/html/qtflagpropertymanager-members.html b/qtpropertybrowser/doc/html/qtflagpropertymanager-members.html
index 3ed3cd25..8bea175d 100644
--- a/qtpropertybrowser/doc/html/qtflagpropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtflagpropertymanager-members.html
@@ -42,7 +42,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#eventFilter">eventFilter</a></b> ( QObject *, QEvent * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="qtflagpropertymanager.html#flagNames">flagNames</a></b> ( const QtProperty * ) const : QStringList</div></li>
 <li><div class="fn"><b><a href="qtflagpropertymanager.html#flagNamesChanged">flagNamesChanged</a></b> ( QtProperty *, const QStringList &amp; )</div></li>
 <li><div class="fn"><b><a href="qtabstractpropertymanager.html#hasValue">hasValue</a></b> ( const QtProperty * ) const : bool</div></li>
diff --git a/qtpropertybrowser/doc/html/qtfonteditorfactory-members.html b/qtpropertybrowser/doc/html/qtfonteditorfactory-members.html
index 849cb2c6..bf5826ac 100644
--- a/qtpropertybrowser/doc/html/qtfonteditorfactory-members.html
+++ b/qtpropertybrowser/doc/html/qtfonteditorfactory-members.html
@@ -45,7 +45,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
 </ul></td><td valign="top"><ul>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#installEventFilter">installEventFilter</a></b> ( QObject * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#isWidgetType">isWidgetType</a></b> () const</div></li>
diff --git a/qtpropertybrowser/doc/html/qtfontpropertymanager-members.html b/qtpropertybrowser/doc/html/qtfontpropertymanager-members.html
index d3b76bcb..dd178112 100644
--- a/qtpropertybrowser/doc/html/qtfontpropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtfontpropertymanager-members.html
@@ -42,7 +42,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#eventFilter">eventFilter</a></b> ( QObject *, QEvent * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="qtabstractpropertymanager.html#hasValue">hasValue</a></b> ( const QtProperty * ) const : bool</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="qtfontpropertymanager.html#initializeProperty">initializeProperty</a></b> ( QtProperty * )</div></li>
diff --git a/qtpropertybrowser/doc/html/qtgroupboxpropertybrowser-members.html b/qtpropertybrowser/doc/html/qtgroupboxpropertybrowser-members.html
index 7ce0783a..44a74f5e 100644
--- a/qtpropertybrowser/doc/html/qtgroupboxpropertybrowser-members.html
+++ b/qtpropertybrowser/doc/html/qtgroupboxpropertybrowser-members.html
@@ -86,7 +86,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qwidget.html#find">find</a></b> ( WId )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qwidget.html#focusInEvent">focusInEvent</a></b> ( QFocusEvent * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qwidget.html#focusNextChild">focusNextChild</a></b> ()</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qwidget.html#focusNextPrevChild">focusNextPrevChild</a></b> ( bool )</div></li>
diff --git a/qtpropertybrowser/doc/html/qtgrouppropertymanager-members.html b/qtpropertybrowser/doc/html/qtgrouppropertymanager-members.html
index fc17939e..0a305ce4 100644
--- a/qtpropertybrowser/doc/html/qtgrouppropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtgrouppropertymanager-members.html
@@ -42,7 +42,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#eventFilter">eventFilter</a></b> ( QObject *, QEvent * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="qtgrouppropertymanager.html#hasValue">hasValue</a></b> ( const QtProperty * ) const : bool</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="qtgrouppropertymanager.html#initializeProperty">initializeProperty</a></b> ( QtProperty * )</div></li>
diff --git a/qtpropertybrowser/doc/html/qtintpropertymanager-members.html b/qtpropertybrowser/doc/html/qtintpropertymanager-members.html
index 23411b18..233939af 100644
--- a/qtpropertybrowser/doc/html/qtintpropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtintpropertymanager-members.html
@@ -42,7 +42,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#eventFilter">eventFilter</a></b> ( QObject *, QEvent * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="qtabstractpropertymanager.html#hasValue">hasValue</a></b> ( const QtProperty * ) const : bool</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="qtintpropertymanager.html#initializeProperty">initializeProperty</a></b> ( QtProperty * )</div></li>
diff --git a/qtpropertybrowser/doc/html/qtkeysequenceeditorfactory-members.html b/qtpropertybrowser/doc/html/qtkeysequenceeditorfactory-members.html
index c7422e45..f83f9891 100644
--- a/qtpropertybrowser/doc/html/qtkeysequenceeditorfactory-members.html
+++ b/qtpropertybrowser/doc/html/qtkeysequenceeditorfactory-members.html
@@ -45,7 +45,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
 </ul></td><td valign="top"><ul>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#installEventFilter">installEventFilter</a></b> ( QObject * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#isWidgetType">isWidgetType</a></b> () const</div></li>
diff --git a/qtpropertybrowser/doc/html/qtkeysequencepropertymanager-members.html b/qtpropertybrowser/doc/html/qtkeysequencepropertymanager-members.html
index 729bd9c7..cb5a067c 100644
--- a/qtpropertybrowser/doc/html/qtkeysequencepropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtkeysequencepropertymanager-members.html
@@ -42,7 +42,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#eventFilter">eventFilter</a></b> ( QObject *, QEvent * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="qtabstractpropertymanager.html#hasValue">hasValue</a></b> ( const QtProperty * ) const : bool</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="qtkeysequencepropertymanager.html#initializeProperty">initializeProperty</a></b> ( QtProperty * )</div></li>
diff --git a/qtpropertybrowser/doc/html/qtlineeditfactory-members.html b/qtpropertybrowser/doc/html/qtlineeditfactory-members.html
index b61d7355..f7a14984 100644
--- a/qtpropertybrowser/doc/html/qtlineeditfactory-members.html
+++ b/qtpropertybrowser/doc/html/qtlineeditfactory-members.html
@@ -45,7 +45,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
 </ul></td><td valign="top"><ul>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#installEventFilter">installEventFilter</a></b> ( QObject * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#isWidgetType">isWidgetType</a></b> () const</div></li>
diff --git a/qtpropertybrowser/doc/html/qtlocalepropertymanager-members.html b/qtpropertybrowser/doc/html/qtlocalepropertymanager-members.html
index 63b36c38..e6df7ca4 100644
--- a/qtpropertybrowser/doc/html/qtlocalepropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtlocalepropertymanager-members.html
@@ -42,7 +42,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#eventFilter">eventFilter</a></b> ( QObject *, QEvent * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="qtabstractpropertymanager.html#hasValue">hasValue</a></b> ( const QtProperty * ) const : bool</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="qtlocalepropertymanager.html#initializeProperty">initializeProperty</a></b> ( QtProperty * )</div></li>
diff --git a/qtpropertybrowser/doc/html/qtpointfpropertymanager-members.html b/qtpropertybrowser/doc/html/qtpointfpropertymanager-members.html
index d71dc42d..446dfcab 100644
--- a/qtpropertybrowser/doc/html/qtpointfpropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtpointfpropertymanager-members.html
@@ -44,7 +44,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#eventFilter">eventFilter</a></b> ( QObject *, QEvent * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="qtabstractpropertymanager.html#hasValue">hasValue</a></b> ( const QtProperty * ) const : bool</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="qtpointfpropertymanager.html#initializeProperty">initializeProperty</a></b> ( QtProperty * )</div></li>
diff --git a/qtpropertybrowser/doc/html/qtpointpropertymanager-members.html b/qtpropertybrowser/doc/html/qtpointpropertymanager-members.html
index 109c4278..6a22277f 100644
--- a/qtpropertybrowser/doc/html/qtpointpropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtpointpropertymanager-members.html
@@ -42,7 +42,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#eventFilter">eventFilter</a></b> ( QObject *, QEvent * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="qtabstractpropertymanager.html#hasValue">hasValue</a></b> ( const QtProperty * ) const : bool</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="qtpointpropertymanager.html#initializeProperty">initializeProperty</a></b> ( QtProperty * )</div></li>
diff --git a/qtpropertybrowser/doc/html/qtpropertybrowser.index b/qtpropertybrowser/doc/html/qtpropertybrowser.index
index 5fc52844..312f9b85 100644
--- a/qtpropertybrowser/doc/html/qtpropertybrowser.index
+++ b/qtpropertybrowser/doc/html/qtpropertybrowser.index
@@ -187,24 +187,24 @@
             <function access="public" threadsafety="unspecified" status="commendable" name="value" fullname="QtStringPropertyManager::value" href="qtstringpropertymanager.html#value" location="qtpropertymanager.h" virtual="non" meta="plain" const="true" static="false" overload="false" type="QString" signature="value(const QtProperty * property) const">
                 <parameter left="const QtProperty *" right="" name="property" default=""/>
             </function>
-            <function access="public" threadsafety="unspecified" status="commendable" name="regExp" fullname="QtStringPropertyManager::regExp" href="qtstringpropertymanager.html#regExp" location="qtpropertymanager.h" virtual="non" meta="plain" const="true" static="false" overload="false" type="QRegExp" signature="regExp(const QtProperty * property) const">
+            <function access="public" threadsafety="unspecified" status="commendable" name="regExp" fullname="QtStringPropertyManager::regExp" href="qtstringpropertymanager.html#regExp" location="qtpropertymanager.h" virtual="non" meta="plain" const="true" static="false" overload="false" type="QRegularExpression" signature="regExp(const QtProperty * property) const">
                 <parameter left="const QtProperty *" right="" name="property" default=""/>
             </function>
             <function access="public" threadsafety="unspecified" status="commendable" name="setValue" fullname="QtStringPropertyManager::setValue" href="qtstringpropertymanager.html#setValue" location="qtpropertymanager.cpp" virtual="non" meta="slot" const="false" static="false" overload="false" type="void" signature="setValue(QtProperty * property, const QString &amp; value)">
                 <parameter left="QtProperty *" right="" name="property" default=""/>
                 <parameter left="const QString &amp;" right="" name="value" default=""/>
             </function>
-            <function access="public" threadsafety="unspecified" status="commendable" name="setRegExp" fullname="QtStringPropertyManager::setRegExp" href="qtstringpropertymanager.html#setRegExp" location="qtpropertymanager.h" virtual="non" meta="slot" const="false" static="false" overload="false" type="void" signature="setRegExp(QtProperty * property, const QRegExp &amp; regExp)">
+            <function access="public" threadsafety="unspecified" status="commendable" name="setRegExp" fullname="QtStringPropertyManager::setRegExp" href="qtstringpropertymanager.html#setRegExp" location="qtpropertymanager.h" virtual="non" meta="slot" const="false" static="false" overload="false" type="void" signature="setRegExp(QtProperty * property, const QRegularExpression &amp; regExp)">
                 <parameter left="QtProperty *" right="" name="property" default=""/>
-                <parameter left="const QRegExp &amp;" right="" name="regExp" default=""/>
+                <parameter left="const QRegularExpression &amp;" right="" name="regExp" default=""/>
             </function>
             <function access="public" threadsafety="unspecified" status="commendable" name="valueChanged" fullname="QtStringPropertyManager::valueChanged" href="qtstringpropertymanager.html#valueChanged" location="qtpropertymanager.h" virtual="non" meta="signal" const="false" static="false" overload="false" type="void" signature="valueChanged(QtProperty * property, const QString &amp; value)">
                 <parameter left="QtProperty *" right="" name="property" default=""/>
                 <parameter left="const QString &amp;" right="" name="value" default=""/>
             </function>
-            <function access="public" threadsafety="unspecified" status="commendable" name="regExpChanged" fullname="QtStringPropertyManager::regExpChanged" href="qtstringpropertymanager.html#regExpChanged" location="qtpropertymanager.h" virtual="non" meta="signal" const="false" static="false" overload="false" type="void" signature="regExpChanged(QtProperty * property, const QRegExp &amp; regExp)">
+            <function access="public" threadsafety="unspecified" status="commendable" name="regExpChanged" fullname="QtStringPropertyManager::regExpChanged" href="qtstringpropertymanager.html#regExpChanged" location="qtpropertymanager.h" virtual="non" meta="signal" const="false" static="false" overload="false" type="void" signature="regExpChanged(QtProperty * property, const QRegularExpression &amp; regExp)">
                 <parameter left="QtProperty *" right="" name="property" default=""/>
-                <parameter left="const QRegExp &amp;" right="" name="regExp" default=""/>
+                <parameter left="const QRegularExpression &amp;" right="" name="regExp" default=""/>
             </function>
             <function access="protected" threadsafety="unspecified" status="commendable" name="valueText" fullname="QtStringPropertyManager::valueText" href="qtstringpropertymanager.html#valueText" location="qtpropertymanager.h" virtual="impure" meta="plain" const="true" static="false" overload="false" type="QString" signature="valueText(const QtProperty * property) const">
                 <parameter left="const QtProperty *" right="" name="property" default=""/>
diff --git a/qtpropertybrowser/doc/html/qtrectfpropertymanager-members.html b/qtpropertybrowser/doc/html/qtrectfpropertymanager-members.html
index 4589e59e..b4da35a2 100644
--- a/qtpropertybrowser/doc/html/qtrectfpropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtrectfpropertymanager-members.html
@@ -46,7 +46,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#eventFilter">eventFilter</a></b> ( QObject *, QEvent * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="qtabstractpropertymanager.html#hasValue">hasValue</a></b> ( const QtProperty * ) const : bool</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="qtrectfpropertymanager.html#initializeProperty">initializeProperty</a></b> ( QtProperty * )</div></li>
diff --git a/qtpropertybrowser/doc/html/qtrectpropertymanager-members.html b/qtpropertybrowser/doc/html/qtrectpropertymanager-members.html
index 8018a763..1560db19 100644
--- a/qtpropertybrowser/doc/html/qtrectpropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtrectpropertymanager-members.html
@@ -44,7 +44,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#eventFilter">eventFilter</a></b> ( QObject *, QEvent * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="qtabstractpropertymanager.html#hasValue">hasValue</a></b> ( const QtProperty * ) const : bool</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="qtrectpropertymanager.html#initializeProperty">initializeProperty</a></b> ( QtProperty * )</div></li>
diff --git a/qtpropertybrowser/doc/html/qtscrollbarfactory-members.html b/qtpropertybrowser/doc/html/qtscrollbarfactory-members.html
index 32d9dd2c..5d755ead 100644
--- a/qtpropertybrowser/doc/html/qtscrollbarfactory-members.html
+++ b/qtpropertybrowser/doc/html/qtscrollbarfactory-members.html
@@ -45,7 +45,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
 </ul></td><td valign="top"><ul>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#installEventFilter">installEventFilter</a></b> ( QObject * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#isWidgetType">isWidgetType</a></b> () const</div></li>
diff --git a/qtpropertybrowser/doc/html/qtsizefpropertymanager-members.html b/qtpropertybrowser/doc/html/qtsizefpropertymanager-members.html
index eb7235e2..d3bb04cb 100644
--- a/qtpropertybrowser/doc/html/qtsizefpropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtsizefpropertymanager-members.html
@@ -44,7 +44,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#eventFilter">eventFilter</a></b> ( QObject *, QEvent * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="qtabstractpropertymanager.html#hasValue">hasValue</a></b> ( const QtProperty * ) const : bool</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="qtsizefpropertymanager.html#initializeProperty">initializeProperty</a></b> ( QtProperty * )</div></li>
diff --git a/qtpropertybrowser/doc/html/qtsizepolicypropertymanager-members.html b/qtpropertybrowser/doc/html/qtsizepolicypropertymanager-members.html
index ec47a57a..9edcb973 100644
--- a/qtpropertybrowser/doc/html/qtsizepolicypropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtsizepolicypropertymanager-members.html
@@ -42,7 +42,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#eventFilter">eventFilter</a></b> ( QObject *, QEvent * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="qtabstractpropertymanager.html#hasValue">hasValue</a></b> ( const QtProperty * ) const : bool</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="qtsizepolicypropertymanager.html#initializeProperty">initializeProperty</a></b> ( QtProperty * )</div></li>
diff --git a/qtpropertybrowser/doc/html/qtsizepropertymanager-members.html b/qtpropertybrowser/doc/html/qtsizepropertymanager-members.html
index 35cf20d3..be930226 100644
--- a/qtpropertybrowser/doc/html/qtsizepropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtsizepropertymanager-members.html
@@ -42,7 +42,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#eventFilter">eventFilter</a></b> ( QObject *, QEvent * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="qtabstractpropertymanager.html#hasValue">hasValue</a></b> ( const QtProperty * ) const : bool</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="qtsizepropertymanager.html#initializeProperty">initializeProperty</a></b> ( QtProperty * )</div></li>
diff --git a/qtpropertybrowser/doc/html/qtsliderfactory-members.html b/qtpropertybrowser/doc/html/qtsliderfactory-members.html
index fb2e26a4..8091878e 100644
--- a/qtpropertybrowser/doc/html/qtsliderfactory-members.html
+++ b/qtpropertybrowser/doc/html/qtsliderfactory-members.html
@@ -45,7 +45,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
 </ul></td><td valign="top"><ul>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#installEventFilter">installEventFilter</a></b> ( QObject * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#isWidgetType">isWidgetType</a></b> () const</div></li>
diff --git a/qtpropertybrowser/doc/html/qtspinboxfactory-members.html b/qtpropertybrowser/doc/html/qtspinboxfactory-members.html
index 535a6aeb..91c23f39 100644
--- a/qtpropertybrowser/doc/html/qtspinboxfactory-members.html
+++ b/qtpropertybrowser/doc/html/qtspinboxfactory-members.html
@@ -45,7 +45,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
 </ul></td><td valign="top"><ul>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#installEventFilter">installEventFilter</a></b> ( QObject * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#isWidgetType">isWidgetType</a></b> () const</div></li>
diff --git a/qtpropertybrowser/doc/html/qtstringpropertymanager-members.html b/qtpropertybrowser/doc/html/qtstringpropertymanager-members.html
index eb88f591..02561e10 100644
--- a/qtpropertybrowser/doc/html/qtstringpropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtstringpropertymanager-members.html
@@ -42,7 +42,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#eventFilter">eventFilter</a></b> ( QObject *, QEvent * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="qtabstractpropertymanager.html#hasValue">hasValue</a></b> ( const QtProperty * ) const : bool</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="qtstringpropertymanager.html#initializeProperty">initializeProperty</a></b> ( QtProperty * )</div></li>
@@ -61,14 +61,14 @@
 <li><div class="fn"><b><a href="qtabstractpropertymanager.html#propertyInserted">propertyInserted</a></b> ( QtProperty *, QtProperty *, QtProperty * )</div></li>
 <li><div class="fn"><b><a href="qtabstractpropertymanager.html#propertyRemoved">propertyRemoved</a></b> ( QtProperty *, QtProperty * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#receivers">receivers</a></b> ( const char * ) const</div></li>
-<li><div class="fn"><b><a href="qtstringpropertymanager.html#regExp">regExp</a></b> ( const QtProperty * ) const : QRegExp</div></li>
-<li><div class="fn"><b><a href="qtstringpropertymanager.html#regExpChanged">regExpChanged</a></b> ( QtProperty *, const QRegExp &amp; )</div></li>
+<li><div class="fn"><b><a href="qtstringpropertymanager.html#regExp">regExp</a></b> ( const QtProperty * ) const : QRegularExpression</div></li>
+<li><div class="fn"><b><a href="qtstringpropertymanager.html#regExpChanged">regExpChanged</a></b> ( QtProperty *, const QRegularExpression &amp; )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#removeEventFilter">removeEventFilter</a></b> ( QObject * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#sender">sender</a></b> () const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#objectName-prop">setObjectName</a></b> ( const QString &amp; )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#setParent">setParent</a></b> ( QObject * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#setProperty">setProperty</a></b> ( const char *, const QVariant &amp; )</div></li>
-<li><div class="fn"><b><a href="qtstringpropertymanager.html#setRegExp">setRegExp</a></b> ( QtProperty *, const QRegExp &amp; )</div></li>
+<li><div class="fn"><b><a href="qtstringpropertymanager.html#setRegExp">setRegExp</a></b> ( QtProperty *, const QRegularExpression &amp; )</div></li>
 <li><div class="fn"><b><a href="qtstringpropertymanager.html#setValue">setValue</a></b> ( QtProperty *, const QString &amp; )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#signalsBlocked">signalsBlocked</a></b> () const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#startTimer">startTimer</a></b> ( int )</div></li>
diff --git a/qtpropertybrowser/doc/html/qtstringpropertymanager.html b/qtpropertybrowser/doc/html/qtstringpropertymanager.html
index c346d7bb..3ddc58ad 100644
--- a/qtpropertybrowser/doc/html/qtstringpropertymanager.html
+++ b/qtpropertybrowser/doc/html/qtstringpropertymanager.html
@@ -24,7 +24,7 @@ <h2>Public Functions</h2>
 <table class="alignedsummary" border="0" cellpadding="0" cellspacing="0" width="100%">
 <tr><td class="memItemLeft" align="right" valign="top"></td><td class="memItemRight" valign="bottom"><b><a href="qtstringpropertymanager.html#QtStringPropertyManager">QtStringPropertyManager</a></b> ( QObject * <i>parent</i> = 0 )</td></tr>
 <tr><td class="memItemLeft" align="right" valign="top"></td><td class="memItemRight" valign="bottom"><b><a href="qtstringpropertymanager.html#dtor.QtStringPropertyManager">~QtStringPropertyManager</a></b> ()</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">QRegExp </td><td class="memItemRight" valign="bottom"><b><a href="qtstringpropertymanager.html#regExp">regExp</a></b> ( const QtProperty * <i>property</i> ) const</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">QRegularExpression </td><td class="memItemRight" valign="bottom"><b><a href="qtstringpropertymanager.html#regExp">regExp</a></b> ( const QtProperty * <i>property</i> ) const</td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">QString </td><td class="memItemRight" valign="bottom"><b><a href="qtstringpropertymanager.html#value">value</a></b> ( const QtProperty * <i>property</i> ) const</td></tr>
 </table>
 <ul>
@@ -35,7 +35,7 @@ <h2>Public Functions</h2>
 <a name="public-slots"></a>
 <h2>Public Slots</h2>
 <table class="alignedsummary" border="0" cellpadding="0" cellspacing="0" width="100%">
-<tr><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><b><a href="qtstringpropertymanager.html#setRegExp">setRegExp</a></b> ( QtProperty * <i>property</i>, const QRegExp &amp; <i>regExp</i> )</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><b><a href="qtstringpropertymanager.html#setRegExp">setRegExp</a></b> ( QtProperty * <i>property</i>, const QRegularExpression &amp; <i>regExp</i> )</td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><b><a href="qtstringpropertymanager.html#setValue">setValue</a></b> ( QtProperty * <i>property</i>, const QString &amp; <i>value</i> )</td></tr>
 </table>
 <ul>
@@ -45,7 +45,7 @@ <h2>Public Slots</h2>
 <a name="signals"></a>
 <h2>Signals</h2>
 <table class="alignedsummary" border="0" cellpadding="0" cellspacing="0" width="100%">
-<tr><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><b><a href="qtstringpropertymanager.html#regExpChanged">regExpChanged</a></b> ( QtProperty * <i>property</i>, const QRegExp &amp; <i>regExp</i> )</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><b><a href="qtstringpropertymanager.html#regExpChanged">regExpChanged</a></b> ( QtProperty * <i>property</i>, const QRegularExpression &amp; <i>regExp</i> )</td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><b><a href="qtstringpropertymanager.html#valueChanged">valueChanged</a></b> ( QtProperty * <i>property</i>, const QString &amp; <i>value</i> )</td></tr>
 </table>
 <ul>
@@ -89,14 +89,14 @@ <h3 class="fn"><a name="dtor.QtStringPropertyManager"></a>QtStringPropertyManage
 <p>Destroys this manager, and all the properties it has created.</p>
 <h3 class="fn"><a name="initializeProperty"></a>void QtStringPropertyManager::initializeProperty ( <a href="qtproperty.html">QtProperty</a> * <i>property</i> )&nbsp;&nbsp;<tt> [virtual protected]</tt></h3>
 <p>Reimplemented from <a href="qtabstractpropertymanager.html#initializeProperty">QtAbstractPropertyManager::initializeProperty</a>().</p>
-<h3 class="fn"><a name="regExp"></a><a href="http://qt.nokia.com/doc/4.6/qregexp.html">QRegExp</a> QtStringPropertyManager::regExp ( const <a href="qtproperty.html">QtProperty</a> * <i>property</i> ) const</h3>
+<h3 class="fn"><a name="regExp"></a><a href="http://qt.nokia.com/doc/4.6/QRegularExpression.html">QRegularExpression</a> QtStringPropertyManager::regExp ( const <a href="qtproperty.html">QtProperty</a> * <i>property</i> ) const</h3>
 <p>Returns the given <i>property</i>'s currently set regular expression.</p>
 <p>If the given <i>property</i> is not managed by this manager, this function returns an empty expression.</p>
 <p>See also <a href="qtstringpropertymanager.html#setRegExp">setRegExp</a>().</p>
-<h3 class="fn"><a name="regExpChanged"></a>void QtStringPropertyManager::regExpChanged ( <a href="qtproperty.html">QtProperty</a> * <i>property</i>, const <a href="http://qt.nokia.com/doc/4.6/qregexp.html">QRegExp</a> &amp; <i>regExp</i> )&nbsp;&nbsp;<tt> [signal]</tt></h3>
+<h3 class="fn"><a name="regExpChanged"></a>void QtStringPropertyManager::regExpChanged ( <a href="qtproperty.html">QtProperty</a> * <i>property</i>, const <a href="http://qt.nokia.com/doc/4.6/QRegularExpression.html">QRegularExpression</a> &amp; <i>regExp</i> )&nbsp;&nbsp;<tt> [signal]</tt></h3>
 <p>This signal is emitted whenever a property created by this manager changes its currenlty set regular expression, passing a pointer to the <i>property</i> and the new <i>regExp</i> as parameters.</p>
 <p>See also <a href="qtstringpropertymanager.html#setRegExp">setRegExp</a>().</p>
-<h3 class="fn"><a name="setRegExp"></a>void QtStringPropertyManager::setRegExp ( <a href="qtproperty.html">QtProperty</a> * <i>property</i>, const <a href="http://qt.nokia.com/doc/4.6/qregexp.html">QRegExp</a> &amp; <i>regExp</i> )&nbsp;&nbsp;<tt> [slot]</tt></h3>
+<h3 class="fn"><a name="setRegExp"></a>void QtStringPropertyManager::setRegExp ( <a href="qtproperty.html">QtProperty</a> * <i>property</i>, const <a href="http://qt.nokia.com/doc/4.6/QRegularExpression.html">QRegularExpression</a> &amp; <i>regExp</i> )&nbsp;&nbsp;<tt> [slot]</tt></h3>
 <p>Sets the regular expression of the given <i>property</i> to <i>regExp</i>.</p>
 <p>See also <a href="qtstringpropertymanager.html#regExp">regExp</a>(), <a href="qtstringpropertymanager.html#setValue">setValue</a>(), and <a href="qtstringpropertymanager.html#regExpChanged">regExpChanged</a>().</p>
 <h3 class="fn"><a name="setValue"></a>void QtStringPropertyManager::setValue ( <a href="qtproperty.html">QtProperty</a> * <i>property</i>, const <a href="http://qt.nokia.com/doc/4.6/qstring.html">QString</a> &amp; <i>value</i> )&nbsp;&nbsp;<tt> [slot]</tt></h3>
diff --git a/qtpropertybrowser/doc/html/qttimeeditfactory-members.html b/qtpropertybrowser/doc/html/qttimeeditfactory-members.html
index 510764da..98cd7300 100644
--- a/qtpropertybrowser/doc/html/qttimeeditfactory-members.html
+++ b/qtpropertybrowser/doc/html/qttimeeditfactory-members.html
@@ -45,7 +45,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
 </ul></td><td valign="top"><ul>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#installEventFilter">installEventFilter</a></b> ( QObject * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#isWidgetType">isWidgetType</a></b> () const</div></li>
diff --git a/qtpropertybrowser/doc/html/qttimepropertymanager-members.html b/qtpropertybrowser/doc/html/qttimepropertymanager-members.html
index 9b2e0bcb..e4f5f796 100644
--- a/qtpropertybrowser/doc/html/qttimepropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qttimepropertymanager-members.html
@@ -42,7 +42,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#eventFilter">eventFilter</a></b> ( QObject *, QEvent * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="qtabstractpropertymanager.html#hasValue">hasValue</a></b> ( const QtProperty * ) const : bool</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="qttimepropertymanager.html#initializeProperty">initializeProperty</a></b> ( QtProperty * )</div></li>
diff --git a/qtpropertybrowser/doc/html/qttreepropertybrowser-members.html b/qtpropertybrowser/doc/html/qttreepropertybrowser-members.html
index 8d3e67d3..c826a020 100644
--- a/qtpropertybrowser/doc/html/qttreepropertybrowser-members.html
+++ b/qtpropertybrowser/doc/html/qttreepropertybrowser-members.html
@@ -93,7 +93,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qwidget.html#find">find</a></b> ( WId )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qwidget.html#focusInEvent">focusInEvent</a></b> ( QFocusEvent * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qwidget.html#focusNextChild">focusNextChild</a></b> ()</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qwidget.html#focusNextPrevChild">focusNextPrevChild</a></b> ( bool )</div></li>
diff --git a/qtpropertybrowser/doc/html/qtvarianteditorfactory-members.html b/qtpropertybrowser/doc/html/qtvarianteditorfactory-members.html
index ab327798..62091121 100644
--- a/qtpropertybrowser/doc/html/qtvarianteditorfactory-members.html
+++ b/qtpropertybrowser/doc/html/qtvarianteditorfactory-members.html
@@ -45,7 +45,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
 </ul></td><td valign="top"><ul>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#installEventFilter">installEventFilter</a></b> ( QObject * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#isWidgetType">isWidgetType</a></b> () const</div></li>
diff --git a/qtpropertybrowser/doc/html/qtvariantpropertymanager-members.html b/qtpropertybrowser/doc/html/qtvariantpropertymanager-members.html
index 9e1ce208..cd74b8bf 100644
--- a/qtpropertybrowser/doc/html/qtvariantpropertymanager-members.html
+++ b/qtpropertybrowser/doc/html/qtvariantpropertymanager-members.html
@@ -47,7 +47,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#eventFilter">eventFilter</a></b> ( QObject *, QEvent * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="qtvariantpropertymanager.html#flagTypeId">flagTypeId</a></b> () : int</div></li>
 <li><div class="fn"><b><a href="qtvariantpropertymanager.html#groupTypeId">groupTypeId</a></b> () : int</div></li>
 <li><div class="fn"><b><a href="qtvariantpropertymanager.html#hasValue">hasValue</a></b> ( const QtProperty * ) const : bool</div></li>
diff --git a/qtpropertybrowser/src/qteditorfactory.cpp b/qtpropertybrowser/src/qteditorfactory.cpp
index d1f7d145..8df7502e 100644
--- a/qtpropertybrowser/src/qteditorfactory.cpp
+++ b/qtpropertybrowser/src/qteditorfactory.cpp
@@ -22,6 +22,7 @@
 #include <QStyleOption>
 #include <QPainter>
 #include <QMap>
+#include <QRegularExpression>
 
 #if defined(Q_CC_MSVC)
 #    pragma warning(disable: 4786) /* MS VS 6: truncating debug info after 255 characters */
@@ -938,7 +939,7 @@ class QtLineEditFactoryPrivate : public EditorFactoryPrivate<QLineEdit>
 public:
 
     void slotPropertyChanged(QtProperty *property, const QString &value);
-    void slotRegExpChanged(QtProperty *property, const QRegExp &regExp);
+    void slotRegExpChanged(QtProperty *property, const QRegularExpression &regExp);
     void slotSetValue(const QString &value);
     void slotEchoModeChanged(QtProperty *, int);
     void slotReadOnlyChanged(QtProperty *, bool);
@@ -962,7 +963,7 @@ void QtLineEditFactoryPrivate::slotPropertyChanged(QtProperty *property,
 }
 
 void QtLineEditFactoryPrivate::slotRegExpChanged(QtProperty *property,
-            const QRegExp &regExp)
+            const QRegularExpression &regExp)
 {
     if (!m_createdEditors.contains(property))
         return;
@@ -978,7 +979,7 @@ void QtLineEditFactoryPrivate::slotRegExpChanged(QtProperty *property,
         const QValidator *oldValidator = editor->validator();
         QValidator *newValidator = 0;
         if (regExp.isValid()) {
-            newValidator = new QRegExpValidator(regExp, editor);
+            newValidator = new QRegularExpressionValidator(regExp, editor);
         }
         editor->setValidator(newValidator);
         if (oldValidator)
@@ -1078,8 +1079,8 @@ void QtLineEditFactory::connectPropertyManager(QtStringPropertyManager *manager)
 {
     connect(manager, SIGNAL(valueChanged(QtProperty *, const QString &)),
             this, SLOT(slotPropertyChanged(QtProperty *, const QString &)));
-    connect(manager, SIGNAL(regExpChanged(QtProperty *, const QRegExp &)),
-            this, SLOT(slotRegExpChanged(QtProperty *, const QRegExp &)));
+    connect(manager, SIGNAL(regExpChanged(QtProperty *, const QRegularExpression &)),
+            this, SLOT(slotRegExpChanged(QtProperty *, const QRegularExpression &)));
     connect(manager, SIGNAL(echoModeChanged(QtProperty*, int)),
             this, SLOT(slotEchoModeChanged(QtProperty *, int)));
     connect(manager, SIGNAL(readOnlyChanged(QtProperty*, bool)),
@@ -1098,9 +1099,9 @@ QWidget *QtLineEditFactory::createEditor(QtStringPropertyManager *manager,
     QLineEdit *editor = d_ptr->createEditor(property, parent);
     editor->setEchoMode((EchoMode)manager->echoMode(property));
     editor->setReadOnly(manager->isReadOnly(property));
-    QRegExp regExp = manager->regExp(property);
+    QRegularExpression regExp = manager->regExp(property);
     if (regExp.isValid()) {
-        QValidator *validator = new QRegExpValidator(regExp, editor);
+        QValidator *validator = new QRegularExpressionValidator (regExp, editor);
         editor->setValidator(validator);
     }
     editor->setText(manager->value(property));
@@ -1121,8 +1122,8 @@ void QtLineEditFactory::disconnectPropertyManager(QtStringPropertyManager *manag
 {
     disconnect(manager, SIGNAL(valueChanged(QtProperty *, const QString &)),
                 this, SLOT(slotPropertyChanged(QtProperty *, const QString &)));
-    disconnect(manager, SIGNAL(regExpChanged(QtProperty *, const QRegExp &)),
-                this, SLOT(slotRegExpChanged(QtProperty *, const QRegExp &)));
+    disconnect(manager, SIGNAL(regExpChanged(QtProperty *, const QRegularExpression &)),
+                this, SLOT(slotRegExpChanged(QtProperty *, const QRegularExpression &)));
     disconnect(manager, SIGNAL(echoModeChanged(QtProperty*,int)),
                 this, SLOT(slotEchoModeChanged(QtProperty *, int)));
     disconnect(manager, SIGNAL(readOnlyChanged(QtProperty*, bool)),
@@ -1633,7 +1634,7 @@ QtCharEdit::QtCharEdit(QWidget *parent)
 {
     QHBoxLayout *layout = new QHBoxLayout(this);
     layout->addWidget(m_lineEdit);
-    layout->setMargin(0);
+    layout->setContentsMargins(0,0,0,0);
     m_lineEdit->installEventFilter(this);
     m_lineEdit->setReadOnly(true);
     m_lineEdit->setFocusProxy(this);
@@ -1757,7 +1758,7 @@ void QtCharEdit::keyReleaseEvent(QKeyEvent *e)
 void QtCharEdit::paintEvent(QPaintEvent *)
 {
     QStyleOption opt;
-    opt.init(this);
+    opt.initFrom(this);
     QPainter p(this);
     style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
 }
@@ -2293,11 +2294,9 @@ void QtColorEditWidget::setValue(const QColor &c)
 
 void QtColorEditWidget::buttonClicked()
 {
-    bool ok = false;
-    QRgb oldRgba = m_color.rgba();
-    QRgb newRgba = QColorDialog::getRgba(oldRgba, &ok, this);
-    if (ok && newRgba != oldRgba) {
-        setValue(QColor::fromRgba(newRgba));
+    auto newRgba = QColorDialog::getColor(m_color, this, "", QColorDialog::ShowAlphaChannel);
+    if (newRgba != m_color) {
+        setValue(newRgba);
         emit valueChanged(m_color);
     }
 }
@@ -2329,7 +2328,7 @@ bool QtColorEditWidget::eventFilter(QObject *obj, QEvent *ev)
 void QtColorEditWidget::paintEvent(QPaintEvent *)
 {
     QStyleOption opt;
-    opt.init(this);
+    opt.initFrom(this);
     QPainter p(this);
     style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
 }
@@ -2551,7 +2550,7 @@ bool QtFontEditWidget::eventFilter(QObject *obj, QEvent *ev)
 void QtFontEditWidget::paintEvent(QPaintEvent *)
 {
     QStyleOption opt;
-    opt.init(this);
+    opt.initFrom(this);
     QPainter p(this);
     style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
 }
diff --git a/qtpropertybrowser/src/qteditorfactory.h b/qtpropertybrowser/src/qteditorfactory.h
index 27bd4bc7..36c707aa 100644
--- a/qtpropertybrowser/src/qteditorfactory.h
+++ b/qtpropertybrowser/src/qteditorfactory.h
@@ -151,7 +151,7 @@ class QT_QTPROPERTYBROWSER_EXPORT QtLineEditFactory : public QtAbstractEditorFac
     Q_DECLARE_PRIVATE(QtLineEditFactory)
     Q_DISABLE_COPY(QtLineEditFactory)
     Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QString &))
-    Q_PRIVATE_SLOT(d_func(), void slotRegExpChanged(QtProperty *, const QRegExp &))
+    Q_PRIVATE_SLOT(d_func(), void slotRegExpChanged(QtProperty *, const QRegularExpression &))
     Q_PRIVATE_SLOT(d_func(), void slotEchoModeChanged(QtProperty *, int))
     Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool))
     Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QString &))
diff --git a/qtpropertybrowser/src/qtpropertybrowserutils.cpp b/qtpropertybrowser/src/qtpropertybrowserutils.cpp
index 54400eee..464221c4 100644
--- a/qtpropertybrowser/src/qtpropertybrowserutils.cpp
+++ b/qtpropertybrowser/src/qtpropertybrowserutils.cpp
@@ -249,7 +249,7 @@ void QtBoolEdit::mousePressEvent(QMouseEvent *event)
 void QtBoolEdit::paintEvent(QPaintEvent *)
 {
     QStyleOption opt;
-    opt.init(this);
+    opt.initFrom(this);
     QPainter p(this);
     style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
 }
@@ -261,7 +261,7 @@ QtKeySequenceEdit::QtKeySequenceEdit(QWidget *parent)
 {
     QHBoxLayout *layout = new QHBoxLayout(this);
     layout->addWidget(m_lineEdit);
-    layout->setMargin(0);
+    layout->setContentsMargins(0,0,0,0);
     m_lineEdit->installEventFilter(this);
     m_lineEdit->setReadOnly(true);
     m_lineEdit->setFocusProxy(this);
@@ -395,7 +395,7 @@ void QtKeySequenceEdit::keyReleaseEvent(QKeyEvent *e)
 void QtKeySequenceEdit::paintEvent(QPaintEvent *)
 {
     QStyleOption opt;
-    opt.init(this);
+    opt.initFrom(this);
     QPainter p(this);
     style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
 }
diff --git a/qtpropertybrowser/src/qtpropertymanager.cpp b/qtpropertybrowser/src/qtpropertymanager.cpp
index 3b5f295e..85607ab3 100644
--- a/qtpropertybrowser/src/qtpropertymanager.cpp
+++ b/qtpropertybrowser/src/qtpropertymanager.cpp
@@ -1266,12 +1266,12 @@ class QtStringPropertyManagerPrivate
 
     struct Data
     {
-        Data() : regExp(QString(QLatin1Char('*')),  Qt::CaseSensitive, QRegExp::Wildcard),
+        Data() : regExp(".*"),
             echoMode(QLineEdit::Normal), readOnly(false)
         {
         }
         QString val;
-        QRegExp regExp;
+        QRegularExpression regExp;
         int echoMode;
         bool readOnly;
     };
@@ -1311,7 +1311,7 @@ class QtStringPropertyManagerPrivate
 */
 
 /*!
-    \fn void QtStringPropertyManager::regExpChanged(QtProperty *property, const QRegExp &regExp)
+    \fn void QtStringPropertyManager::regExpChanged(QtProperty *property, const QRegularExpression &regExp)
 
     This signal is emitted whenever a property created by this manager
     changes its currenlty set regular expression, passing a pointer to
@@ -1360,9 +1360,9 @@ QString QtStringPropertyManager::value(const QtProperty *property) const
 
     \sa setRegExp()
 */
-QRegExp QtStringPropertyManager::regExp(const QtProperty *property) const
+QRegularExpression QtStringPropertyManager::regExp(const QtProperty *property) const
 {
-    return getData<QRegExp>(d_ptr->m_values, &QtStringPropertyManagerPrivate::Data::regExp, property, QRegExp());
+    return getData<QRegularExpression>(d_ptr->m_values, &QtStringPropertyManagerPrivate::Data::regExp, property, QRegularExpression());
 }
 
 /*!
@@ -1433,7 +1433,7 @@ void QtStringPropertyManager::setValue(QtProperty *property, const QString &val)
     if (data.val == val)
         return;
 
-    if (data.regExp.isValid() && !data.regExp.exactMatch(val))
+    if (data.regExp.isValid() && !data.regExp.match(val).hasMatch())
         return;
 
     data.val = val;
@@ -1449,7 +1449,7 @@ void QtStringPropertyManager::setValue(QtProperty *property, const QString &val)
 
     \sa regExp(), setValue(), regExpChanged()
 */
-void QtStringPropertyManager::setRegExp(QtProperty *property, const QRegExp &regExp)
+void QtStringPropertyManager::setRegExp(QtProperty *property, const QRegularExpression &regExp)
 {
     const QtStringPropertyManagerPrivate::PropertyValueMap::iterator it = d_ptr->m_values.find(property);
     if (it == d_ptr->m_values.end())
@@ -6023,7 +6023,7 @@ void QtFontPropertyManager::setValue(QtProperty *property, const QFont &val)
         return;
 
     const QFont oldVal = it.value();
-    if (oldVal == val && oldVal.resolve() == val.resolve())
+    if (oldVal == val)
         return;
 
     it.value() = val;
diff --git a/qtpropertybrowser/src/qtpropertymanager.h b/qtpropertybrowser/src/qtpropertymanager.h
index 7072c25b..d101bc7a 100644
--- a/qtpropertybrowser/src/qtpropertymanager.h
+++ b/qtpropertybrowser/src/qtpropertymanager.h
@@ -7,6 +7,7 @@
 
 #include "qtpropertybrowser.h"
 #include <QLineEdit>
+#include <QRegularExpression>
 
 #if QT_VERSION >= 0x040400
 QT_BEGIN_NAMESPACE
@@ -147,19 +148,19 @@ class QT_QTPROPERTYBROWSER_EXPORT QtStringPropertyManager : public QtAbstractPro
     ~QtStringPropertyManager();
 
     QString value(const QtProperty *property) const;
-    QRegExp regExp(const QtProperty *property) const;
+    QRegularExpression regExp(const QtProperty *property) const;
     EchoMode echoMode(const QtProperty *property) const;
     bool isReadOnly(const QtProperty *property) const;
 
 public Q_SLOTS:
     void setValue(QtProperty *property, const QString &val);
-    void setRegExp(QtProperty *property, const QRegExp &regExp);
+    void setRegExp(QtProperty *property, const QRegularExpression &regExp);
     void setEchoMode(QtProperty *property, EchoMode echoMode);
     void setReadOnly(QtProperty *property, bool readOnly);
 
 Q_SIGNALS:
     void valueChanged(QtProperty *property, const QString &val);
-    void regExpChanged(QtProperty *property, const QRegExp &regExp);
+    void regExpChanged(QtProperty *property, const QRegularExpression &regExp);
     void echoModeChanged(QtProperty *property, const int);
     void readOnlyChanged(QtProperty *property, bool);
 
diff --git a/qtpropertybrowser/src/qttreepropertybrowser.cpp b/qtpropertybrowser/src/qttreepropertybrowser.cpp
index 45a24913..707552d7 100644
--- a/qtpropertybrowser/src/qttreepropertybrowser.cpp
+++ b/qtpropertybrowser/src/qttreepropertybrowser.cpp
@@ -109,7 +109,7 @@ QtPropertyEditorView::QtPropertyEditorView(QWidget *parent) :
 
 void QtPropertyEditorView::drawRow(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
-    QStyleOptionViewItemV3 opt = option;
+    QStyleOptionViewItem opt = option;
     bool hasValue = true;
     if (m_editorPrivate) {
         QtProperty *property = m_editorPrivate->indexToProperty(index);
@@ -311,7 +311,7 @@ void QtPropertyEditorDelegate::paint(QPainter *painter, const QStyleOptionViewIt
         if (property)
             hasValue = property->hasValue();
     }
-    QStyleOptionViewItemV3 opt = option;
+    QStyleOptionViewItem opt = option;
     if ((m_editorPrivate && index.column() == 0) || !hasValue) {
         QtProperty *property = m_editorPrivate->indexToProperty(index);
         if (property && property->isModified()) {
@@ -325,7 +325,7 @@ void QtPropertyEditorDelegate::paint(QPainter *painter, const QStyleOptionViewIt
         opt.palette.setColor(QPalette::Text, opt.palette.color(QPalette::BrightText));
     } else {
         c = m_editorPrivate->calculatedBackgroundColor(m_editorPrivate->indexToBrowserItem(index));
-        if (c.isValid() && (opt.features & QStyleOptionViewItemV2::Alternate))
+        if (c.isValid() && (opt.features & QStyleOptionViewItem::Alternate))
             c = c.lighter(112);
     }
     if (c.isValid())
@@ -429,7 +429,7 @@ static QIcon drawIndicatorIcon(const QPalette &palette, QStyle *style)
 void QtTreePropertyBrowserPrivate::init(QWidget *parent)
 {
     QHBoxLayout *layout = new QHBoxLayout(parent);
-    layout->setMargin(0);
+    layout->setContentsMargins(0,0,0,0);
     m_treeWidget = new QtPropertyEditorView(parent);
     m_treeWidget->setEditorPrivate(this);
     m_treeWidget->setIconSize(QSize(18, 18));
@@ -446,8 +446,8 @@ void QtTreePropertyBrowserPrivate::init(QWidget *parent)
     m_delegate = new QtPropertyEditorDelegate(parent);
     m_delegate->setEditorPrivate(this);
     m_treeWidget->setItemDelegate(m_delegate);
-    m_treeWidget->header()->setMovable(false);
-    m_treeWidget->header()->setResizeMode(QHeaderView::Stretch);
+    m_treeWidget->header()-> setSectionsMovable(false);
+    m_treeWidget->header()->setSectionResizeMode(QHeaderView::Stretch);
 
     m_expandIcon = drawIndicatorIcon(q_ptr->palette(), q_ptr->style());
 
@@ -552,7 +552,7 @@ void QtTreePropertyBrowserPrivate::propertyInserted(QtBrowserItem *index, QtBrow
     m_indexToItem[index] = newItem;
 
     newItem->setFlags(newItem->flags() | Qt::ItemIsEditable);
-    m_treeWidget->setItemExpanded(newItem, true);
+    m_treeWidget->expandItem(newItem);
 
     updateItem(newItem);
 }
@@ -859,7 +859,7 @@ void QtTreePropertyBrowser::setResizeMode(QtTreePropertyBrowser::ResizeMode mode
         case QtTreePropertyBrowser::Stretch:
         default:                                      m = QHeaderView::Stretch;          break;
     }
-    d_ptr->m_treeWidget->header()->setResizeMode(m);
+    d_ptr->m_treeWidget->header()->setSectionResizeMode(m);
 }
 
 /*!
diff --git a/qtpropertybrowser/src/qtvariantproperty.cpp b/qtpropertybrowser/src/qtvariantproperty.cpp
index bea4b5dd..52f1766d 100644
--- a/qtpropertybrowser/src/qtvariantproperty.cpp
+++ b/qtpropertybrowser/src/qtvariantproperty.cpp
@@ -278,7 +278,7 @@ class QtVariantPropertyManagerPrivate
     void slotDecimalsChanged(QtProperty *property, int prec);
     void slotValueChanged(QtProperty *property, bool val);
     void slotValueChanged(QtProperty *property, const QString &val);
-    void slotRegExpChanged(QtProperty *property, const QRegExp &regExp);
+    void slotRegExpChanged(QtProperty *property, const QRegularExpression &regExp);
     void slotEchoModeChanged(QtProperty *property, int);
     void slotValueChanged(QtProperty *property, const QDate &val);
     void slotRangeChanged(QtProperty *property, const QDate &min, const QDate &max);
@@ -504,7 +504,7 @@ void QtVariantPropertyManagerPrivate::slotValueChanged(QtProperty *property, con
     valueChanged(property, QVariant(val));
 }
 
-void QtVariantPropertyManagerPrivate::slotRegExpChanged(QtProperty *property, const QRegExp &regExp)
+void QtVariantPropertyManagerPrivate::slotRegExpChanged(QtProperty *property, const QRegularExpression &regExp)
 {
     if (QtVariantProperty *varProp = m_internalToProperty.value(property, 0))
         emit q_ptr->attributeChanged(varProp, m_regExpAttribute, QVariant(regExp));
@@ -554,7 +554,7 @@ void QtVariantPropertyManagerPrivate::slotValueChanged(QtProperty *property, con
 void QtVariantPropertyManagerPrivate::slotValueChanged(QtProperty *property, const QKeySequence &val)
 {
     QVariant v;
-    qVariantSetValue(v, val);
+    v.setValue(val);
     valueChanged(property, v);
 }
 
@@ -641,7 +641,7 @@ void QtVariantPropertyManagerPrivate::slotEnumIconsChanged(QtProperty *property,
 {
     if (QtVariantProperty *varProp = m_internalToProperty.value(property, 0)) {
         QVariant v;
-        qVariantSetValue(v, enumIcons);
+        v.setValue(enumIcons);
         emit q_ptr->attributeChanged(varProp, m_enumIconsAttribute, v);
     }
 }
@@ -980,7 +980,7 @@ QtVariantPropertyManager::QtVariantPropertyManager(QObject *parent)
     d_ptr->m_typeToPropertyManager[QVariant::String] = stringPropertyManager;
     d_ptr->m_typeToValueType[QVariant::String] = QVariant::String;
     d_ptr->m_typeToAttributeToAttributeType[QVariant::String][d_ptr->m_regExpAttribute] =
-            QVariant::RegExp;
+            QVariant::RegularExpression;
     d_ptr->m_typeToAttributeToAttributeType[QVariant::String][d_ptr->m_echoModeAttribute] =
             QVariant::Int;
     d_ptr->m_typeToAttributeToAttributeType[QVariant::String][d_ptr->m_readOnlyAttribute] =
@@ -988,8 +988,8 @@ QtVariantPropertyManager::QtVariantPropertyManager(QObject *parent)
 
     connect(stringPropertyManager, SIGNAL(valueChanged(QtProperty *, const QString &)),
                 this, SLOT(slotValueChanged(QtProperty *, const QString &)));
-    connect(stringPropertyManager, SIGNAL(regExpChanged(QtProperty *, const QRegExp &)),
-                this, SLOT(slotRegExpChanged(QtProperty *, const QRegExp &)));
+    connect(stringPropertyManager, SIGNAL(regExpChanged(QtProperty *, const QRegularExpression &)),
+                this, SLOT(slotRegExpChanged(QtProperty *, const QRegularExpression &)));
     connect(stringPropertyManager, SIGNAL(echoModeChanged(QtProperty*,int)),
                 this, SLOT(slotEchoModeChanged(QtProperty*, int)));
     connect(stringPropertyManager, SIGNAL(readOnlyChanged(QtProperty*, bool)),
@@ -1532,7 +1532,7 @@ QVariant QtVariantPropertyManager::attributeValue(const QtProperty *property, co
             return enumManager->enumNames(internProp);
         if (attribute == d_ptr->m_enumIconsAttribute) {
             QVariant v;
-            qVariantSetValue(v, enumManager->enumIcons(internProp));
+            v.setValue(enumManager->enumIcons(internProp));
             return v;
         }
         return QVariant();
@@ -1612,73 +1612,73 @@ void QtVariantPropertyManager::setValue(QtProperty *property, const QVariant &va
 
     QtAbstractPropertyManager *manager = internProp->propertyManager();
     if (QtIntPropertyManager *intManager = qobject_cast<QtIntPropertyManager *>(manager)) {
-        intManager->setValue(internProp, qVariantValue<int>(val));
+        intManager->setValue(internProp,  val.value<int>());
         return;
     } else if (QtDoublePropertyManager *doubleManager = qobject_cast<QtDoublePropertyManager *>(manager)) {
-        doubleManager->setValue(internProp, qVariantValue<double>(val));
+        doubleManager->setValue(internProp,  val.value<double>());
         return;
     } else if (QtBoolPropertyManager *boolManager = qobject_cast<QtBoolPropertyManager *>(manager)) {
-        boolManager->setValue(internProp, qVariantValue<bool>(val));
+        boolManager->setValue(internProp, val.value<bool>());
         return;
     } else if (QtStringPropertyManager *stringManager = qobject_cast<QtStringPropertyManager *>(manager)) {
-        stringManager->setValue(internProp, qVariantValue<QString>(val));
+        stringManager->setValue(internProp, val.value<QString>());
         return;
     } else if (QtDatePropertyManager *dateManager = qobject_cast<QtDatePropertyManager *>(manager)) {
-        dateManager->setValue(internProp, qVariantValue<QDate>(val));
+        dateManager->setValue(internProp, val.value<QDate>());
         return;
     } else if (QtTimePropertyManager *timeManager = qobject_cast<QtTimePropertyManager *>(manager)) {
-        timeManager->setValue(internProp, qVariantValue<QTime>(val));
+        timeManager->setValue(internProp, val.value<QTime>());
         return;
     } else if (QtDateTimePropertyManager *dateTimeManager = qobject_cast<QtDateTimePropertyManager *>(manager)) {
-        dateTimeManager->setValue(internProp, qVariantValue<QDateTime>(val));
+        dateTimeManager->setValue(internProp, val.value<QDateTime>());
         return;
     } else if (QtKeySequencePropertyManager *keySequenceManager = qobject_cast<QtKeySequencePropertyManager *>(manager)) {
-        keySequenceManager->setValue(internProp, qVariantValue<QKeySequence>(val));
+        keySequenceManager->setValue(internProp, val.value<QKeySequence>());
         return;
     } else if (QtCharPropertyManager *charManager = qobject_cast<QtCharPropertyManager *>(manager)) {
-        charManager->setValue(internProp, qVariantValue<QChar>(val));
+        charManager->setValue(internProp, val.value<QChar>());
         return;
     } else if (QtLocalePropertyManager *localeManager = qobject_cast<QtLocalePropertyManager *>(manager)) {
-        localeManager->setValue(internProp, qVariantValue<QLocale>(val));
+        localeManager->setValue(internProp, val.value<QLocale>());
         return;
     } else if (QtPointPropertyManager *pointManager = qobject_cast<QtPointPropertyManager *>(manager)) {
-        pointManager->setValue(internProp, qVariantValue<QPoint>(val));
+        pointManager->setValue(internProp, val.value<QPoint>());
         return;
     } else if (QtPointFPropertyManager *pointFManager = qobject_cast<QtPointFPropertyManager *>(manager)) {
-        pointFManager->setValue(internProp, qVariantValue<QPointF>(val));
+        pointFManager->setValue(internProp, val.value<QPointF>());
         return;
     } else if (QtSizePropertyManager *sizeManager = qobject_cast<QtSizePropertyManager *>(manager)) {
-        sizeManager->setValue(internProp, qVariantValue<QSize>(val));
+        sizeManager->setValue(internProp, val.value<QSize>());
         return;
     } else if (QtSizeFPropertyManager *sizeFManager = qobject_cast<QtSizeFPropertyManager *>(manager)) {
-        sizeFManager->setValue(internProp, qVariantValue<QSizeF>(val));
+        sizeFManager->setValue(internProp, val.value<QSizeF>());
         return;
     } else if (QtRectPropertyManager *rectManager = qobject_cast<QtRectPropertyManager *>(manager)) {
-        rectManager->setValue(internProp, qVariantValue<QRect>(val));
+        rectManager->setValue(internProp, val.value<QRect>());
         return;
     } else if (QtRectFPropertyManager *rectFManager = qobject_cast<QtRectFPropertyManager *>(manager)) {
-        rectFManager->setValue(internProp, qVariantValue<QRectF>(val));
+        rectFManager->setValue(internProp, val.value<QRectF>());
         return;
     } else if (QtColorPropertyManager *colorManager = qobject_cast<QtColorPropertyManager *>(manager)) {
-        colorManager->setValue(internProp, qVariantValue<QColor>(val));
+        colorManager->setValue(internProp, val.value<QColor>());
         return;
     } else if (QtEnumPropertyManager *enumManager = qobject_cast<QtEnumPropertyManager *>(manager)) {
-        enumManager->setValue(internProp, qVariantValue<int>(val));
+        enumManager->setValue(internProp, val.value<int>());
         return;
     } else if (QtSizePolicyPropertyManager *sizePolicyManager =
                qobject_cast<QtSizePolicyPropertyManager *>(manager)) {
-        sizePolicyManager->setValue(internProp, qVariantValue<QSizePolicy>(val));
+        sizePolicyManager->setValue(internProp, val.value<QSizePolicy>());
         return;
     } else if (QtFontPropertyManager *fontManager = qobject_cast<QtFontPropertyManager *>(manager)) {
-        fontManager->setValue(internProp, qVariantValue<QFont>(val));
+        fontManager->setValue(internProp, val.value<QFont>());
         return;
 #ifndef QT_NO_CURSOR
     } else if (QtCursorPropertyManager *cursorManager = qobject_cast<QtCursorPropertyManager *>(manager)) {
-        cursorManager->setValue(internProp, qVariantValue<QCursor>(val));
+        cursorManager->setValue(internProp, val.value<QCursor>());
         return;
 #endif
     } else if (QtFlagPropertyManager *flagManager = qobject_cast<QtFlagPropertyManager *>(manager)) {
-        flagManager->setValue(internProp, qVariantValue<int>(val));
+        flagManager->setValue(internProp, val.value<int>());
         return;
     }
 }
@@ -1716,81 +1716,81 @@ void QtVariantPropertyManager::setAttribute(QtProperty *property,
     QtAbstractPropertyManager *manager = internProp->propertyManager();
     if (QtIntPropertyManager *intManager = qobject_cast<QtIntPropertyManager *>(manager)) {
         if (attribute == d_ptr->m_maximumAttribute)
-            intManager->setMaximum(internProp, qVariantValue<int>(value));
+            intManager->setMaximum(internProp, value.value<int>());
         else if (attribute == d_ptr->m_minimumAttribute)
-            intManager->setMinimum(internProp, qVariantValue<int>(value));
+            intManager->setMinimum(internProp, value.value<int>());
         else if (attribute == d_ptr->m_singleStepAttribute)
-            intManager->setSingleStep(internProp, qVariantValue<int>(value));
+            intManager->setSingleStep(internProp, value.value<int>());
         else if (attribute == d_ptr->m_readOnlyAttribute)
-            intManager->setReadOnly(internProp, qVariantValue<bool>(value));
+            intManager->setReadOnly(internProp, value.value<bool>());
         return;
     } else if (QtDoublePropertyManager *doubleManager = qobject_cast<QtDoublePropertyManager *>(manager)) {
         if (attribute == d_ptr->m_maximumAttribute)
-            doubleManager->setMaximum(internProp, qVariantValue<double>(value));
+            doubleManager->setMaximum(internProp, value.value<double>());
         if (attribute == d_ptr->m_minimumAttribute)
-            doubleManager->setMinimum(internProp, qVariantValue<double>(value));
+            doubleManager->setMinimum(internProp, value.value<double>());
         if (attribute == d_ptr->m_singleStepAttribute)
-            doubleManager->setSingleStep(internProp, qVariantValue<double>(value));
+            doubleManager->setSingleStep(internProp, value.value<double>());
         if (attribute == d_ptr->m_decimalsAttribute)
-            doubleManager->setDecimals(internProp, qVariantValue<int>(value));
+            doubleManager->setDecimals(internProp, value.value<int>());
         if (attribute == d_ptr->m_readOnlyAttribute)
-            doubleManager->setReadOnly(internProp, qVariantValue<bool>(value));
+            doubleManager->setReadOnly(internProp, value.value<bool>());
         return;
     } else if (QtBoolPropertyManager *boolManager = qobject_cast<QtBoolPropertyManager *>(manager)) {
         if (attribute == d_ptr->m_textVisibleAttribute)
-            boolManager->setTextVisible(internProp, qVariantValue<bool>(value));
+            boolManager->setTextVisible(internProp, value.value<bool>());
         return;
     } else if (QtStringPropertyManager *stringManager = qobject_cast<QtStringPropertyManager *>(manager)) {
         if (attribute == d_ptr->m_regExpAttribute)
-            stringManager->setRegExp(internProp, qVariantValue<QRegExp>(value));
+            stringManager->setRegExp(internProp, value.value<QRegularExpression>());
         if (attribute == d_ptr->m_echoModeAttribute)
-            stringManager->setEchoMode(internProp, (EchoMode)qVariantValue<int>(value));
+            stringManager->setEchoMode(internProp, (EchoMode)value.value<int>());
         if (attribute == d_ptr->m_readOnlyAttribute)
-            stringManager->setReadOnly(internProp, (EchoMode)qVariantValue<bool>(value));
+            stringManager->setReadOnly(internProp, (EchoMode)value.value<bool>());
         return;
     } else if (QtDatePropertyManager *dateManager = qobject_cast<QtDatePropertyManager *>(manager)) {
         if (attribute == d_ptr->m_maximumAttribute)
-            dateManager->setMaximum(internProp, qVariantValue<QDate>(value));
+            dateManager->setMaximum(internProp, value.value<QDate>());
         if (attribute == d_ptr->m_minimumAttribute)
-            dateManager->setMinimum(internProp, qVariantValue<QDate>(value));
+            dateManager->setMinimum(internProp, value.value<QDate>());
         return;
     } else if (QtPointFPropertyManager *pointFManager = qobject_cast<QtPointFPropertyManager *>(manager)) {
         if (attribute == d_ptr->m_decimalsAttribute)
-            pointFManager->setDecimals(internProp, qVariantValue<int>(value));
+            pointFManager->setDecimals(internProp, value.value<int>());
         return;
     } else if (QtSizePropertyManager *sizeManager = qobject_cast<QtSizePropertyManager *>(manager)) {
         if (attribute == d_ptr->m_maximumAttribute)
-            sizeManager->setMaximum(internProp, qVariantValue<QSize>(value));
+            sizeManager->setMaximum(internProp, value.value<QSize>());
         if (attribute == d_ptr->m_minimumAttribute)
-            sizeManager->setMinimum(internProp, qVariantValue<QSize>(value));
+            sizeManager->setMinimum(internProp, value.value<QSize>());
         return;
     } else if (QtSizeFPropertyManager *sizeFManager = qobject_cast<QtSizeFPropertyManager *>(manager)) {
         if (attribute == d_ptr->m_maximumAttribute)
-            sizeFManager->setMaximum(internProp, qVariantValue<QSizeF>(value));
+            sizeFManager->setMaximum(internProp, value.value<QSizeF>());
         if (attribute == d_ptr->m_minimumAttribute)
-            sizeFManager->setMinimum(internProp, qVariantValue<QSizeF>(value));
+            sizeFManager->setMinimum(internProp, value.value<QSizeF>());
         if (attribute == d_ptr->m_decimalsAttribute)
-            sizeFManager->setDecimals(internProp, qVariantValue<int>(value));
+            sizeFManager->setDecimals(internProp, value.value<int>());
         return;
     } else if (QtRectPropertyManager *rectManager = qobject_cast<QtRectPropertyManager *>(manager)) {
         if (attribute == d_ptr->m_constraintAttribute)
-            rectManager->setConstraint(internProp, qVariantValue<QRect>(value));
+            rectManager->setConstraint(internProp, value.value<QRect>());
         return;
     } else if (QtRectFPropertyManager *rectFManager = qobject_cast<QtRectFPropertyManager *>(manager)) {
         if (attribute == d_ptr->m_constraintAttribute)
-            rectFManager->setConstraint(internProp, qVariantValue<QRectF>(value));
+            rectFManager->setConstraint(internProp, value.value<QRectF>());
         if (attribute == d_ptr->m_decimalsAttribute)
-            rectFManager->setDecimals(internProp, qVariantValue<int>(value));
+            rectFManager->setDecimals(internProp, value.value<int>());
         return;
     } else if (QtEnumPropertyManager *enumManager = qobject_cast<QtEnumPropertyManager *>(manager)) {
         if (attribute == d_ptr->m_enumNamesAttribute)
-            enumManager->setEnumNames(internProp, qVariantValue<QStringList>(value));
+            enumManager->setEnumNames(internProp, value.value<QStringList>());
         if (attribute == d_ptr->m_enumIconsAttribute)
-            enumManager->setEnumIcons(internProp, qVariantValue<QtIconMap>(value));
+            enumManager->setEnumIcons(internProp, value.value<QtIconMap>());
         return;
     } else if (QtFlagPropertyManager *flagManager = qobject_cast<QtFlagPropertyManager *>(manager)) {
         if (attribute == d_ptr->m_flagNamesAttribute)
-            flagManager->setFlagNames(internProp, qVariantValue<QStringList>(value));
+            flagManager->setFlagNames(internProp, value.value<QStringList>());
         return;
     }
 }
@@ -2052,87 +2052,87 @@ QtVariantEditorFactory::~QtVariantEditorFactory()
 */
 void QtVariantEditorFactory::connectPropertyManager(QtVariantPropertyManager *manager)
 {
-    QList<QtIntPropertyManager *> intPropertyManagers = qFindChildren<QtIntPropertyManager *>(manager);
+    QList<QtIntPropertyManager *> intPropertyManagers = manager->findChildren<QtIntPropertyManager *>();
     QListIterator<QtIntPropertyManager *> itInt(intPropertyManagers);
     while (itInt.hasNext())
         d_ptr->m_spinBoxFactory->addPropertyManager(itInt.next());
 
-    QList<QtDoublePropertyManager *> doublePropertyManagers = qFindChildren<QtDoublePropertyManager *>(manager);
+    QList<QtDoublePropertyManager *> doublePropertyManagers = manager->findChildren<QtDoublePropertyManager *>();
     QListIterator<QtDoublePropertyManager *> itDouble(doublePropertyManagers);
     while (itDouble.hasNext())
         d_ptr->m_doubleSpinBoxFactory->addPropertyManager(itDouble.next());
 
-    QList<QtBoolPropertyManager *> boolPropertyManagers = qFindChildren<QtBoolPropertyManager *>(manager);
+    QList<QtBoolPropertyManager *> boolPropertyManagers = manager->findChildren<QtBoolPropertyManager *>();
     QListIterator<QtBoolPropertyManager *> itBool(boolPropertyManagers);
     while (itBool.hasNext())
         d_ptr->m_checkBoxFactory->addPropertyManager(itBool.next());
 
-    QList<QtStringPropertyManager *> stringPropertyManagers = qFindChildren<QtStringPropertyManager *>(manager);
+    QList<QtStringPropertyManager *> stringPropertyManagers = manager->findChildren<QtStringPropertyManager *>();
     QListIterator<QtStringPropertyManager *> itString(stringPropertyManagers);
     while (itString.hasNext())
         d_ptr->m_lineEditFactory->addPropertyManager(itString.next());
 
-    QList<QtDatePropertyManager *> datePropertyManagers = qFindChildren<QtDatePropertyManager *>(manager);
+    QList<QtDatePropertyManager *> datePropertyManagers = manager->findChildren<QtDatePropertyManager *>();
     QListIterator<QtDatePropertyManager *> itDate(datePropertyManagers);
     while (itDate.hasNext())
         d_ptr->m_dateEditFactory->addPropertyManager(itDate.next());
 
-    QList<QtTimePropertyManager *> timePropertyManagers = qFindChildren<QtTimePropertyManager *>(manager);
+    QList<QtTimePropertyManager *> timePropertyManagers = manager->findChildren<QtTimePropertyManager *>();
     QListIterator<QtTimePropertyManager *> itTime(timePropertyManagers);
     while (itTime.hasNext())
         d_ptr->m_timeEditFactory->addPropertyManager(itTime.next());
 
-    QList<QtDateTimePropertyManager *> dateTimePropertyManagers = qFindChildren<QtDateTimePropertyManager *>(manager);
+    QList<QtDateTimePropertyManager *> dateTimePropertyManagers = manager->findChildren<QtDateTimePropertyManager *>();
     QListIterator<QtDateTimePropertyManager *> itDateTime(dateTimePropertyManagers);
     while (itDateTime.hasNext())
         d_ptr->m_dateTimeEditFactory->addPropertyManager(itDateTime.next());
 
-    QList<QtKeySequencePropertyManager *> keySequencePropertyManagers = qFindChildren<QtKeySequencePropertyManager *>(manager);
+    QList<QtKeySequencePropertyManager *> keySequencePropertyManagers = manager->findChildren<QtKeySequencePropertyManager *>();
     QListIterator<QtKeySequencePropertyManager *> itKeySequence(keySequencePropertyManagers);
     while (itKeySequence.hasNext())
         d_ptr->m_keySequenceEditorFactory->addPropertyManager(itKeySequence.next());
 
-    QList<QtCharPropertyManager *> charPropertyManagers = qFindChildren<QtCharPropertyManager *>(manager);
+    QList<QtCharPropertyManager *> charPropertyManagers = manager->findChildren<QtCharPropertyManager *>();
     QListIterator<QtCharPropertyManager *> itChar(charPropertyManagers);
     while (itChar.hasNext())
         d_ptr->m_charEditorFactory->addPropertyManager(itChar.next());
 
-    QList<QtLocalePropertyManager *> localePropertyManagers = qFindChildren<QtLocalePropertyManager *>(manager);
+    QList<QtLocalePropertyManager *> localePropertyManagers = manager->findChildren<QtLocalePropertyManager *>();
     QListIterator<QtLocalePropertyManager *> itLocale(localePropertyManagers);
     while (itLocale.hasNext())
         d_ptr->m_comboBoxFactory->addPropertyManager(itLocale.next()->subEnumPropertyManager());
 
-    QList<QtPointPropertyManager *> pointPropertyManagers = qFindChildren<QtPointPropertyManager *>(manager);
+    QList<QtPointPropertyManager *> pointPropertyManagers = manager->findChildren<QtPointPropertyManager *>();
     QListIterator<QtPointPropertyManager *> itPoint(pointPropertyManagers);
     while (itPoint.hasNext())
         d_ptr->m_spinBoxFactory->addPropertyManager(itPoint.next()->subIntPropertyManager());
 
-    QList<QtPointFPropertyManager *> pointFPropertyManagers = qFindChildren<QtPointFPropertyManager *>(manager);
+    QList<QtPointFPropertyManager *> pointFPropertyManagers = manager->findChildren<QtPointFPropertyManager *>();
     QListIterator<QtPointFPropertyManager *> itPointF(pointFPropertyManagers);
     while (itPointF.hasNext())
         d_ptr->m_doubleSpinBoxFactory->addPropertyManager(itPointF.next()->subDoublePropertyManager());
 
-    QList<QtSizePropertyManager *> sizePropertyManagers = qFindChildren<QtSizePropertyManager *>(manager);
+    QList<QtSizePropertyManager *> sizePropertyManagers = manager->findChildren<QtSizePropertyManager *>();
     QListIterator<QtSizePropertyManager *> itSize(sizePropertyManagers);
     while (itSize.hasNext())
         d_ptr->m_spinBoxFactory->addPropertyManager(itSize.next()->subIntPropertyManager());
 
-    QList<QtSizeFPropertyManager *> sizeFPropertyManagers = qFindChildren<QtSizeFPropertyManager *>(manager);
+    QList<QtSizeFPropertyManager *> sizeFPropertyManagers = manager->findChildren<QtSizeFPropertyManager *>();
     QListIterator<QtSizeFPropertyManager *> itSizeF(sizeFPropertyManagers);
     while (itSizeF.hasNext())
         d_ptr->m_doubleSpinBoxFactory->addPropertyManager(itSizeF.next()->subDoublePropertyManager());
 
-    QList<QtRectPropertyManager *> rectPropertyManagers = qFindChildren<QtRectPropertyManager *>(manager);
+    QList<QtRectPropertyManager *> rectPropertyManagers = manager->findChildren<QtRectPropertyManager *>();
     QListIterator<QtRectPropertyManager *> itRect(rectPropertyManagers);
     while (itRect.hasNext())
         d_ptr->m_spinBoxFactory->addPropertyManager(itRect.next()->subIntPropertyManager());
 
-    QList<QtRectFPropertyManager *> rectFPropertyManagers = qFindChildren<QtRectFPropertyManager *>(manager);
+    QList<QtRectFPropertyManager *> rectFPropertyManagers = manager->findChildren<QtRectFPropertyManager *>();
     QListIterator<QtRectFPropertyManager *> itRectF(rectFPropertyManagers);
     while (itRectF.hasNext())
         d_ptr->m_doubleSpinBoxFactory->addPropertyManager(itRectF.next()->subDoublePropertyManager());
 
-    QList<QtColorPropertyManager *> colorPropertyManagers = qFindChildren<QtColorPropertyManager *>(manager);
+    QList<QtColorPropertyManager *> colorPropertyManagers = manager->findChildren<QtColorPropertyManager *>();
     QListIterator<QtColorPropertyManager *> itColor(colorPropertyManagers);
     while (itColor.hasNext()) {
         QtColorPropertyManager *manager = itColor.next();
@@ -2140,12 +2140,12 @@ void QtVariantEditorFactory::connectPropertyManager(QtVariantPropertyManager *ma
         d_ptr->m_spinBoxFactory->addPropertyManager(manager->subIntPropertyManager());
     }
 
-    QList<QtEnumPropertyManager *> enumPropertyManagers = qFindChildren<QtEnumPropertyManager *>(manager);
+    QList<QtEnumPropertyManager *> enumPropertyManagers = manager->findChildren<QtEnumPropertyManager *>();
     QListIterator<QtEnumPropertyManager *> itEnum(enumPropertyManagers);
     while (itEnum.hasNext())
         d_ptr->m_comboBoxFactory->addPropertyManager(itEnum.next());
 
-    QList<QtSizePolicyPropertyManager *> sizePolicyPropertyManagers = qFindChildren<QtSizePolicyPropertyManager *>(manager);
+    QList<QtSizePolicyPropertyManager *> sizePolicyPropertyManagers = manager->findChildren<QtSizePolicyPropertyManager *>();
     QListIterator<QtSizePolicyPropertyManager *> itSizePolicy(sizePolicyPropertyManagers);
     while (itSizePolicy.hasNext()) {
         QtSizePolicyPropertyManager *manager = itSizePolicy.next();
@@ -2153,7 +2153,7 @@ void QtVariantEditorFactory::connectPropertyManager(QtVariantPropertyManager *ma
         d_ptr->m_comboBoxFactory->addPropertyManager(manager->subEnumPropertyManager());
     }
 
-    QList<QtFontPropertyManager *> fontPropertyManagers = qFindChildren<QtFontPropertyManager *>(manager);
+    QList<QtFontPropertyManager *> fontPropertyManagers = manager->findChildren<QtFontPropertyManager *>();
     QListIterator<QtFontPropertyManager *> itFont(fontPropertyManagers);
     while (itFont.hasNext()) {
         QtFontPropertyManager *manager = itFont.next();
@@ -2163,12 +2163,12 @@ void QtVariantEditorFactory::connectPropertyManager(QtVariantPropertyManager *ma
         d_ptr->m_checkBoxFactory->addPropertyManager(manager->subBoolPropertyManager());
     }
 
-    QList<QtCursorPropertyManager *> cursorPropertyManagers = qFindChildren<QtCursorPropertyManager *>(manager);
+    QList<QtCursorPropertyManager *> cursorPropertyManagers = manager->findChildren<QtCursorPropertyManager *>();
     QListIterator<QtCursorPropertyManager *> itCursor(cursorPropertyManagers);
     while (itCursor.hasNext())
         d_ptr->m_cursorEditorFactory->addPropertyManager(itCursor.next());
 
-    QList<QtFlagPropertyManager *> flagPropertyManagers = qFindChildren<QtFlagPropertyManager *>(manager);
+    QList<QtFlagPropertyManager *> flagPropertyManagers = manager->findChildren<QtFlagPropertyManager *>();
     QListIterator<QtFlagPropertyManager *> itFlag(flagPropertyManagers);
     while (itFlag.hasNext())
         d_ptr->m_checkBoxFactory->addPropertyManager(itFlag.next()->subBoolPropertyManager());
@@ -2196,87 +2196,87 @@ QWidget *QtVariantEditorFactory::createEditor(QtVariantPropertyManager *manager,
 */
 void QtVariantEditorFactory::disconnectPropertyManager(QtVariantPropertyManager *manager)
 {
-    QList<QtIntPropertyManager *> intPropertyManagers = qFindChildren<QtIntPropertyManager *>(manager);
+    QList<QtIntPropertyManager *> intPropertyManagers = manager->findChildren<QtIntPropertyManager *>();
     QListIterator<QtIntPropertyManager *> itInt(intPropertyManagers);
     while (itInt.hasNext())
         d_ptr->m_spinBoxFactory->removePropertyManager(itInt.next());
 
-    QList<QtDoublePropertyManager *> doublePropertyManagers = qFindChildren<QtDoublePropertyManager *>(manager);
+    QList<QtDoublePropertyManager *> doublePropertyManagers = manager->findChildren<QtDoublePropertyManager *>();
     QListIterator<QtDoublePropertyManager *> itDouble(doublePropertyManagers);
     while (itDouble.hasNext())
         d_ptr->m_doubleSpinBoxFactory->removePropertyManager(itDouble.next());
 
-    QList<QtBoolPropertyManager *> boolPropertyManagers = qFindChildren<QtBoolPropertyManager *>(manager);
+    QList<QtBoolPropertyManager *> boolPropertyManagers = manager->findChildren<QtBoolPropertyManager *>();
     QListIterator<QtBoolPropertyManager *> itBool(boolPropertyManagers);
     while (itBool.hasNext())
         d_ptr->m_checkBoxFactory->removePropertyManager(itBool.next());
 
-    QList<QtStringPropertyManager *> stringPropertyManagers = qFindChildren<QtStringPropertyManager *>(manager);
+    QList<QtStringPropertyManager *> stringPropertyManagers = manager->findChildren<QtStringPropertyManager *>();
     QListIterator<QtStringPropertyManager *> itString(stringPropertyManagers);
     while (itString.hasNext())
         d_ptr->m_lineEditFactory->removePropertyManager(itString.next());
 
-    QList<QtDatePropertyManager *> datePropertyManagers = qFindChildren<QtDatePropertyManager *>(manager);
+    QList<QtDatePropertyManager *> datePropertyManagers = manager->findChildren<QtDatePropertyManager *>();
     QListIterator<QtDatePropertyManager *> itDate(datePropertyManagers);
     while (itDate.hasNext())
         d_ptr->m_dateEditFactory->removePropertyManager(itDate.next());
 
-    QList<QtTimePropertyManager *> timePropertyManagers = qFindChildren<QtTimePropertyManager *>(manager);
+    QList<QtTimePropertyManager *> timePropertyManagers = manager->findChildren<QtTimePropertyManager *>();
     QListIterator<QtTimePropertyManager *> itTime(timePropertyManagers);
     while (itTime.hasNext())
         d_ptr->m_timeEditFactory->removePropertyManager(itTime.next());
 
-    QList<QtDateTimePropertyManager *> dateTimePropertyManagers = qFindChildren<QtDateTimePropertyManager *>(manager);
+    QList<QtDateTimePropertyManager *> dateTimePropertyManagers = manager->findChildren<QtDateTimePropertyManager *>();
     QListIterator<QtDateTimePropertyManager *> itDateTime(dateTimePropertyManagers);
     while (itDateTime.hasNext())
         d_ptr->m_dateTimeEditFactory->removePropertyManager(itDateTime.next());
 
-    QList<QtKeySequencePropertyManager *> keySequencePropertyManagers = qFindChildren<QtKeySequencePropertyManager *>(manager);
+    QList<QtKeySequencePropertyManager *> keySequencePropertyManagers = manager->findChildren<QtKeySequencePropertyManager *>();
     QListIterator<QtKeySequencePropertyManager *> itKeySequence(keySequencePropertyManagers);
     while (itKeySequence.hasNext())
         d_ptr->m_keySequenceEditorFactory->removePropertyManager(itKeySequence.next());
 
-    QList<QtCharPropertyManager *> charPropertyManagers = qFindChildren<QtCharPropertyManager *>(manager);
+    QList<QtCharPropertyManager *> charPropertyManagers = manager->findChildren<QtCharPropertyManager *>();
     QListIterator<QtCharPropertyManager *> itChar(charPropertyManagers);
     while (itChar.hasNext())
         d_ptr->m_charEditorFactory->removePropertyManager(itChar.next());
 
-    QList<QtLocalePropertyManager *> localePropertyManagers = qFindChildren<QtLocalePropertyManager *>(manager);
+    QList<QtLocalePropertyManager *> localePropertyManagers = manager->findChildren<QtLocalePropertyManager *>();
     QListIterator<QtLocalePropertyManager *> itLocale(localePropertyManagers);
     while (itLocale.hasNext())
         d_ptr->m_comboBoxFactory->removePropertyManager(itLocale.next()->subEnumPropertyManager());
 
-    QList<QtPointPropertyManager *> pointPropertyManagers = qFindChildren<QtPointPropertyManager *>(manager);
+    QList<QtPointPropertyManager *> pointPropertyManagers = manager->findChildren<QtPointPropertyManager *>();
     QListIterator<QtPointPropertyManager *> itPoint(pointPropertyManagers);
     while (itPoint.hasNext())
         d_ptr->m_spinBoxFactory->removePropertyManager(itPoint.next()->subIntPropertyManager());
 
-    QList<QtPointFPropertyManager *> pointFPropertyManagers = qFindChildren<QtPointFPropertyManager *>(manager);
+    QList<QtPointFPropertyManager *> pointFPropertyManagers = manager->findChildren<QtPointFPropertyManager *>();
     QListIterator<QtPointFPropertyManager *> itPointF(pointFPropertyManagers);
     while (itPointF.hasNext())
         d_ptr->m_doubleSpinBoxFactory->removePropertyManager(itPointF.next()->subDoublePropertyManager());
 
-    QList<QtSizePropertyManager *> sizePropertyManagers = qFindChildren<QtSizePropertyManager *>(manager);
+    QList<QtSizePropertyManager *> sizePropertyManagers = manager->findChildren<QtSizePropertyManager *>();
     QListIterator<QtSizePropertyManager *> itSize(sizePropertyManagers);
     while (itSize.hasNext())
         d_ptr->m_spinBoxFactory->removePropertyManager(itSize.next()->subIntPropertyManager());
 
-    QList<QtSizeFPropertyManager *> sizeFPropertyManagers = qFindChildren<QtSizeFPropertyManager *>(manager);
+    QList<QtSizeFPropertyManager *> sizeFPropertyManagers = manager->findChildren<QtSizeFPropertyManager *>();
     QListIterator<QtSizeFPropertyManager *> itSizeF(sizeFPropertyManagers);
     while (itSizeF.hasNext())
         d_ptr->m_doubleSpinBoxFactory->removePropertyManager(itSizeF.next()->subDoublePropertyManager());
 
-    QList<QtRectPropertyManager *> rectPropertyManagers = qFindChildren<QtRectPropertyManager *>(manager);
+    QList<QtRectPropertyManager *> rectPropertyManagers = manager->findChildren<QtRectPropertyManager *>();
     QListIterator<QtRectPropertyManager *> itRect(rectPropertyManagers);
     while (itRect.hasNext())
         d_ptr->m_spinBoxFactory->removePropertyManager(itRect.next()->subIntPropertyManager());
 
-    QList<QtRectFPropertyManager *> rectFPropertyManagers = qFindChildren<QtRectFPropertyManager *>(manager);
+    QList<QtRectFPropertyManager *> rectFPropertyManagers = manager->findChildren<QtRectFPropertyManager *>();
     QListIterator<QtRectFPropertyManager *> itRectF(rectFPropertyManagers);
     while (itRectF.hasNext())
         d_ptr->m_doubleSpinBoxFactory->removePropertyManager(itRectF.next()->subDoublePropertyManager());
 
-    QList<QtColorPropertyManager *> colorPropertyManagers = qFindChildren<QtColorPropertyManager *>(manager);
+    QList<QtColorPropertyManager *> colorPropertyManagers = manager->findChildren<QtColorPropertyManager *>();
     QListIterator<QtColorPropertyManager *> itColor(colorPropertyManagers);
     while (itColor.hasNext()) {
         QtColorPropertyManager *manager = itColor.next();
@@ -2284,12 +2284,12 @@ void QtVariantEditorFactory::disconnectPropertyManager(QtVariantPropertyManager
         d_ptr->m_spinBoxFactory->removePropertyManager(manager->subIntPropertyManager());
     }
 
-    QList<QtEnumPropertyManager *> enumPropertyManagers = qFindChildren<QtEnumPropertyManager *>(manager);
+    QList<QtEnumPropertyManager *> enumPropertyManagers = manager->findChildren<QtEnumPropertyManager *>();
     QListIterator<QtEnumPropertyManager *> itEnum(enumPropertyManagers);
     while (itEnum.hasNext())
         d_ptr->m_comboBoxFactory->removePropertyManager(itEnum.next());
 
-    QList<QtSizePolicyPropertyManager *> sizePolicyPropertyManagers = qFindChildren<QtSizePolicyPropertyManager *>(manager);
+    QList<QtSizePolicyPropertyManager *> sizePolicyPropertyManagers = manager->findChildren<QtSizePolicyPropertyManager *>();
     QListIterator<QtSizePolicyPropertyManager *> itSizePolicy(sizePolicyPropertyManagers);
     while (itSizePolicy.hasNext()) {
         QtSizePolicyPropertyManager *manager = itSizePolicy.next();
@@ -2297,7 +2297,7 @@ void QtVariantEditorFactory::disconnectPropertyManager(QtVariantPropertyManager
         d_ptr->m_comboBoxFactory->removePropertyManager(manager->subEnumPropertyManager());
     }
 
-    QList<QtFontPropertyManager *> fontPropertyManagers = qFindChildren<QtFontPropertyManager *>(manager);
+    QList<QtFontPropertyManager *> fontPropertyManagers = manager->findChildren<QtFontPropertyManager *>();
     QListIterator<QtFontPropertyManager *> itFont(fontPropertyManagers);
     while (itFont.hasNext()) {
         QtFontPropertyManager *manager = itFont.next();
@@ -2307,12 +2307,12 @@ void QtVariantEditorFactory::disconnectPropertyManager(QtVariantPropertyManager
         d_ptr->m_checkBoxFactory->removePropertyManager(manager->subBoolPropertyManager());
     }
 
-    QList<QtCursorPropertyManager *> cursorPropertyManagers = qFindChildren<QtCursorPropertyManager *>(manager);
+    QList<QtCursorPropertyManager *> cursorPropertyManagers = manager->findChildren<QtCursorPropertyManager *>();
     QListIterator<QtCursorPropertyManager *> itCursor(cursorPropertyManagers);
     while (itCursor.hasNext())
         d_ptr->m_cursorEditorFactory->removePropertyManager(itCursor.next());
 
-    QList<QtFlagPropertyManager *> flagPropertyManagers = qFindChildren<QtFlagPropertyManager *>(manager);
+    QList<QtFlagPropertyManager *> flagPropertyManagers = manager->findChildren<QtFlagPropertyManager *>();
     QListIterator<QtFlagPropertyManager *> itFlag(flagPropertyManagers);
     while (itFlag.hasNext())
         d_ptr->m_checkBoxFactory->removePropertyManager(itFlag.next()->subBoolPropertyManager());
diff --git a/qtpropertybrowser/src/qtvariantproperty.h b/qtpropertybrowser/src/qtvariantproperty.h
index d1d6d71f..05174abc 100644
--- a/qtpropertybrowser/src/qtvariantproperty.h
+++ b/qtpropertybrowser/src/qtvariantproperty.h
@@ -89,7 +89,7 @@ public Q_SLOTS:
     Q_PRIVATE_SLOT(d_func(), void slotDecimalsChanged(QtProperty *, int))
     Q_PRIVATE_SLOT(d_func(), void slotValueChanged(QtProperty *, bool))
     Q_PRIVATE_SLOT(d_func(), void slotValueChanged(QtProperty *, const QString &))
-    Q_PRIVATE_SLOT(d_func(), void slotRegExpChanged(QtProperty *, const QRegExp &))
+    Q_PRIVATE_SLOT(d_func(), void slotRegExpChanged(QtProperty *, const QRegularExpression &))
     Q_PRIVATE_SLOT(d_func(), void slotEchoModeChanged(QtProperty *, int))
     Q_PRIVATE_SLOT(d_func(), void slotValueChanged(QtProperty *, const QDate &))
     Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, const QDate &, const QDate &))
diff --git a/qtscriptclassic/doc/html/qscriptengine-members.html b/qtscriptclassic/doc/html/qscriptengine-members.html
index ea52c4b8..eaee0431 100644
--- a/qtscriptclassic/doc/html/qscriptengine-members.html
+++ b/qtscriptclassic/doc/html/qscriptengine-members.html
@@ -54,7 +54,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#eventFilter">eventFilter</a></b> ( QObject *, QEvent * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="qscriptengine.html#fromScriptValue">fromScriptValue</a></b> ( const QScriptValue &amp; ) : T</div></li>
 <li><div class="fn"><b><a href="qscriptengine.html#globalObject">globalObject</a></b> () const : QScriptValue</div></li>
 <li><div class="fn"><b><a href="qscriptengine.html#hasUncaughtException">hasUncaughtException</a></b> () const : bool</div></li>
@@ -79,7 +79,7 @@
 <li><div class="fn"><b><a href="qscriptengine.html#newQMetaObject">newQMetaObject</a></b> ( const QMetaObject *, const QScriptValue &amp; ) : QScriptValue</div></li>
 <li><div class="fn"><b><a href="qscriptengine.html#newQObject">newQObject</a></b> ( QObject *, ValueOwnership, const QObjectWrapOptions &amp; ) : QScriptValue</div></li>
 <li><div class="fn"><b><a href="qscriptengine.html#newQObject-2">newQObject</a></b> ( const QScriptValue &amp;, QObject *, ValueOwnership, const QObjectWrapOptions &amp; ) : QScriptValue</div></li>
-<li><div class="fn"><b><a href="qscriptengine.html#newRegExp">newRegExp</a></b> ( const QRegExp &amp; ) : QScriptValue</div></li>
+<li><div class="fn"><b><a href="qscriptengine.html#newRegExp">newRegExp</a></b> ( const QRegularExpression &amp; ) : QScriptValue</div></li>
 <li><div class="fn"><b><a href="qscriptengine.html#newRegExp-2">newRegExp</a></b> ( const QString &amp;, const QString &amp; ) : QScriptValue</div></li>
 <li><div class="fn"><b><a href="qscriptengine.html#newVariant">newVariant</a></b> ( const QVariant &amp; ) : QScriptValue</div></li>
 <li><div class="fn"><b><a href="qscriptengine.html#newVariant-2">newVariant</a></b> ( const QScriptValue &amp;, const QVariant &amp; ) : QScriptValue</div></li>
diff --git a/qtscriptclassic/doc/html/qscriptengine.html b/qtscriptclassic/doc/html/qscriptengine.html
index a5d9d8ac..a33e7ff4 100644
--- a/qtscriptclassic/doc/html/qscriptengine.html
+++ b/qtscriptclassic/doc/html/qscriptengine.html
@@ -65,7 +65,7 @@ <h2>Public Functions</h2>
 <tr><td class="memItemLeft" align="right" valign="top">QScriptValue </td><td class="memItemRight" valign="bottom"><b><a href="qscriptengine.html#newQMetaObject">newQMetaObject</a></b> ( const QMetaObject * <i>metaObject</i>, const QScriptValue &amp; <i>ctor</i> = QScriptValue() )</td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">QScriptValue </td><td class="memItemRight" valign="bottom"><b><a href="qscriptengine.html#newQObject">newQObject</a></b> ( QObject * <i>object</i>, ValueOwnership <i>ownership</i> = QtOwnership, const QObjectWrapOptions &amp; <i>options</i> = 0 )</td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">QScriptValue </td><td class="memItemRight" valign="bottom"><b><a href="qscriptengine.html#newQObject-2">newQObject</a></b> ( const QScriptValue &amp; <i>scriptObject</i>, QObject * <i>qtObject</i>, ValueOwnership <i>ownership</i> = QtOwnership, const QObjectWrapOptions &amp; <i>options</i> = 0 )</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">QScriptValue </td><td class="memItemRight" valign="bottom"><b><a href="qscriptengine.html#newRegExp">newRegExp</a></b> ( const QRegExp &amp; <i>regexp</i> )</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">QScriptValue </td><td class="memItemRight" valign="bottom"><b><a href="qscriptengine.html#newRegExp">newRegExp</a></b> ( const QRegularExpression &amp; <i>regexp</i> )</td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">QScriptValue </td><td class="memItemRight" valign="bottom"><b><a href="qscriptengine.html#newRegExp-2">newRegExp</a></b> ( const QString &amp; <i>pattern</i>, const QString &amp; <i>flags</i> )</td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">QScriptValue </td><td class="memItemRight" valign="bottom"><b><a href="qscriptengine.html#newVariant">newVariant</a></b> ( const QVariant &amp; <i>value</i> )</td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">QScriptValue </td><td class="memItemRight" valign="bottom"><b><a href="qscriptengine.html#newVariant-2">newVariant</a></b> ( const QScriptValue &amp; <i>object</i>, const QVariant &amp; <i>value</i> )</td></tr>
@@ -473,7 +473,7 @@ <h3 class="fn"><a name="newQObject-2"></a><a href="qscriptvalue.html">QScriptVal
 <p>If <i>scriptObject</i> is not an object, this function behaves like the normal <a href="qscriptengine.html#newQObject">newQObject</a>(), i.e&#x2e; it creates a new script object and returns it.</p>
 <p>This function is useful when you want to provide a script constructor for a <a href="http://qt.nokia.com/doc/4.6/qobject.html">QObject</a>-based class. If your constructor is invoked in a <tt>new</tt> expression (<a href="qscriptcontext.html#isCalledAsConstructor">QScriptContext::isCalledAsConstructor</a>() returns true), you can pass <a href="qscriptcontext.html#thisObject">QScriptContext::thisObject</a>() (the default constructed script object) to this function to initialize the new object.</p>
 <p>This function was introduced in qtscriptclassic 4.4.</p>
-<h3 class="fn"><a name="newRegExp"></a><a href="qscriptvalue.html">QScriptValue</a> QScriptEngine::newRegExp ( const <a href="http://qt.nokia.com/doc/4.6/qregexp.html">QRegExp</a> &amp; <i>regexp</i> )</h3>
+<h3 class="fn"><a name="newRegExp"></a><a href="qscriptvalue.html">QScriptValue</a> QScriptEngine::newRegExp ( const <a href="http://qt.nokia.com/doc/4.6/QRegularExpression.html">QRegularExpression</a> &amp; <i>regexp</i> )</h3>
 <p>Creates a <a href="http://qt.nokia.com/doc/4.6/qtscript.html">QtScript</a> object of class RegExp with the given <i>regexp</i>.</p>
 <p>See also <a href="qscriptvalue.html#toRegExp">QScriptValue::toRegExp</a>().</p>
 <h3 class="fn"><a name="newRegExp-2"></a><a href="qscriptvalue.html">QScriptValue</a> QScriptEngine::newRegExp ( const <a href="http://qt.nokia.com/doc/4.6/qstring.html">QString</a> &amp; <i>pattern</i>, const <a href="http://qt.nokia.com/doc/4.6/qstring.html">QString</a> &amp; <i>flags</i> )</h3>
diff --git a/qtscriptclassic/doc/html/qscriptextensionplugin-members.html b/qtscriptclassic/doc/html/qscriptextensionplugin-members.html
index a1b151e7..b5a9d583 100644
--- a/qtscriptclassic/doc/html/qscriptextensionplugin-members.html
+++ b/qtscriptclassic/doc/html/qscriptextensionplugin-members.html
@@ -39,7 +39,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#eventFilter">eventFilter</a></b> ( QObject *, QEvent * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 </ul></td><td valign="top"><ul>
 <li><div class="fn"><b><a href="qscriptextensionplugin.html#initialize">initialize</a></b> ( const QString &amp;, QScriptEngine * )</div></li>
diff --git a/qtscriptclassic/doc/html/qscriptvalue-members.html b/qtscriptclassic/doc/html/qscriptvalue-members.html
index f7b47f9d..d9252125 100644
--- a/qtscriptclassic/doc/html/qscriptvalue-members.html
+++ b/qtscriptclassic/doc/html/qscriptvalue-members.html
@@ -80,7 +80,7 @@
 <li><div class="fn"><b><a href="qscriptvalue.html#toNumber">toNumber</a></b> () const : qsreal</div></li>
 <li><div class="fn"><b><a href="qscriptvalue.html#toQMetaObject">toQMetaObject</a></b> () const : const QMetaObject *</div></li>
 <li><div class="fn"><b><a href="qscriptvalue.html#toQObject">toQObject</a></b> () const : QObject *</div></li>
-<li><div class="fn"><b><a href="qscriptvalue.html#toRegExp">toRegExp</a></b> () const : QRegExp</div></li>
+<li><div class="fn"><b><a href="qscriptvalue.html#toRegExp">toRegExp</a></b> () const : QRegularExpression</div></li>
 <li><div class="fn"><b><a href="qscriptvalue.html#toString">toString</a></b> () const : QString</div></li>
 <li><div class="fn"><b><a href="qscriptvalue.html#toUInt16">toUInt16</a></b> () const : quint16</div></li>
 <li><div class="fn"><b><a href="qscriptvalue.html#toUInt32">toUInt32</a></b> () const : quint32</div></li>
diff --git a/qtscriptclassic/doc/html/qscriptvalue.html b/qtscriptclassic/doc/html/qscriptvalue.html
index ff06ee2d..db16c1a4 100644
--- a/qtscriptclassic/doc/html/qscriptvalue.html
+++ b/qtscriptclassic/doc/html/qscriptvalue.html
@@ -93,7 +93,7 @@ <h2>Public Functions</h2>
 <tr><td class="memItemLeft" align="right" valign="top">qsreal </td><td class="memItemRight" valign="bottom"><b><a href="qscriptvalue.html#toNumber">toNumber</a></b> () const</td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">const QMetaObject * </td><td class="memItemRight" valign="bottom"><b><a href="qscriptvalue.html#toQMetaObject">toQMetaObject</a></b> () const</td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">QObject * </td><td class="memItemRight" valign="bottom"><b><a href="qscriptvalue.html#toQObject">toQObject</a></b> () const</td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">QRegExp </td><td class="memItemRight" valign="bottom"><b><a href="qscriptvalue.html#toRegExp">toRegExp</a></b> () const</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">QRegularExpression </td><td class="memItemRight" valign="bottom"><b><a href="qscriptvalue.html#toRegExp">toRegExp</a></b> () const</td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">QString </td><td class="memItemRight" valign="bottom"><b><a href="qscriptvalue.html#toString">toString</a></b> () const</td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">quint16 </td><td class="memItemRight" valign="bottom"><b><a href="qscriptvalue.html#toUInt16">toUInt16</a></b> () const</td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">quint32 </td><td class="memItemRight" valign="bottom"><b><a href="qscriptvalue.html#toUInt32">toUInt32</a></b> () const</td></tr>
@@ -410,8 +410,8 @@ <h3 class="fn"><a name="toQObject"></a><a href="http://qt.nokia.com/doc/4.6/qobj
 <p>If this <a href="qscriptvalue.html">QScriptValue</a> is a <a href="http://qt.nokia.com/doc/4.6/qobject.html">QObject</a>, returns the <a href="http://qt.nokia.com/doc/4.6/qobject.html">QObject</a> pointer that the <a href="qscriptvalue.html">QScriptValue</a> represents; otherwise, returns 0.</p>
 <p>If the <a href="http://qt.nokia.com/doc/4.6/qobject.html">QObject</a> that this <a href="qscriptvalue.html">QScriptValue</a> wraps has been deleted, this function returns 0 (i.e&#x2e; it is possible for toQObject() to return 0 even when <a href="qscriptvalue.html#isQObject">isQObject</a>() returns true).</p>
 <p>See also <a href="qscriptvalue.html#isQObject">isQObject</a>().</p>
-<h3 class="fn"><a name="toRegExp"></a><a href="http://qt.nokia.com/doc/4.6/qregexp.html">QRegExp</a> QScriptValue::toRegExp () const</h3>
-<p>Returns the <a href="http://qt.nokia.com/doc/4.6/qregexp.html">QRegExp</a> representation of this value. If this <a href="qscriptvalue.html">QScriptValue</a> is not a regular expression, an empty <a href="http://qt.nokia.com/doc/4.6/qregexp.html">QRegExp</a> is returned.</p>
+<h3 class="fn"><a name="toRegExp"></a><a href="http://qt.nokia.com/doc/4.6/QRegularExpression.html">QRegularExpression</a> QScriptValue::toRegExp () const</h3>
+<p>Returns the <a href="http://qt.nokia.com/doc/4.6/QRegularExpression.html">QRegularExpression</a> representation of this value. If this <a href="qscriptvalue.html">QScriptValue</a> is not a regular expression, an empty <a href="http://qt.nokia.com/doc/4.6/QRegularExpression.html">QRegularExpression</a> is returned.</p>
 <p>See also <a href="qscriptvalue.html#isRegExp">isRegExp</a>().</p>
 <h3 class="fn"><a name="toString"></a><a href="http://qt.nokia.com/doc/4.6/qstring.html">QString</a> QScriptValue::toString () const</h3>
 <p>Returns the string value of this <a href="qscriptvalue.html">QScriptValue</a>, as defined in <a href="http://qt.nokia.com/doc/4.6/http-www-ecma-international-org-publications-standards-ecma-262-htm.html">ECMA-262</a> section 9.8, &quot;ToString&quot;.</p>
diff --git a/qtscriptclassic/doc/html/qtscriptclassic.index b/qtscriptclassic/doc/html/qtscriptclassic.index
index 34bb546c..d71c00c3 100644
--- a/qtscriptclassic/doc/html/qtscriptclassic.index
+++ b/qtscriptclassic/doc/html/qtscriptclassic.index
@@ -225,7 +225,7 @@
             <function access="public" threadsafety="unspecified" status="commendable" name="toQMetaObject" fullname="QScriptValue::toQMetaObject" href="qscriptvalue.html#toQMetaObject" location="qscriptvalue.h" virtual="non" meta="plain" const="true" static="false" overload="false" type="const QMetaObject *" signature="toQMetaObject() const"/>
             <function access="public" threadsafety="unspecified" status="obsolete" name="toObject" fullname="QScriptValue::toObject" href="qscriptvalue-obsolete.html#toObject" location="qscriptvalue.h" virtual="non" meta="plain" const="true" static="false" overload="false" type="QScriptValue" signature="toObject() const"/>
             <function access="public" threadsafety="unspecified" status="commendable" name="toDateTime" fullname="QScriptValue::toDateTime" href="qscriptvalue.html#toDateTime" location="qscriptvalue.h" virtual="non" meta="plain" const="true" static="false" overload="false" type="QDateTime" signature="toDateTime() const"/>
-            <function access="public" threadsafety="unspecified" status="commendable" name="toRegExp" fullname="QScriptValue::toRegExp" href="qscriptvalue.html#toRegExp" location="qscriptvalue.h" virtual="non" meta="plain" const="true" static="false" overload="false" type="QRegExp" signature="toRegExp() const"/>
+            <function access="public" threadsafety="unspecified" status="commendable" name="toRegExp" fullname="QScriptValue::toRegExp" href="qscriptvalue.html#toRegExp" location="qscriptvalue.h" virtual="non" meta="plain" const="true" static="false" overload="false" type="QRegularExpression" signature="toRegExp() const"/>
             <function access="public" threadsafety="unspecified" status="commendable" name="instanceOf" fullname="QScriptValue::instanceOf" href="qscriptvalue.html#instanceOf" location="qscriptvalue.h" virtual="non" meta="plain" const="true" static="false" overload="false" type="bool" signature="instanceOf(const QScriptValue &amp; other) const">
                 <parameter left="const QScriptValue &amp;" right="" name="other" default=""/>
             </function>
@@ -469,8 +469,8 @@
                 <parameter left="const QScriptValue &amp;" right="" name="object" default=""/>
                 <parameter left="const QVariant &amp;" right="" name="value" default=""/>
             </function>
-            <function access="public" threadsafety="unspecified" status="commendable" name="newRegExp" fullname="QScriptEngine::newRegExp" href="qscriptengine.html#newRegExp" location="qscriptengine.h" virtual="non" meta="plain" const="false" static="false" overload="false" type="QScriptValue" signature="newRegExp(const QRegExp &amp; regexp)">
-                <parameter left="const QRegExp &amp;" right="" name="regexp" default=""/>
+            <function access="public" threadsafety="unspecified" status="commendable" name="newRegExp" fullname="QScriptEngine::newRegExp" href="qscriptengine.html#newRegExp" location="qscriptengine.h" virtual="non" meta="plain" const="false" static="false" overload="false" type="QScriptValue" signature="newRegExp(const QRegularExpression &amp; regexp)">
+                <parameter left="const QRegularExpression &amp;" right="" name="regexp" default=""/>
             </function>
             <function access="public" threadsafety="unspecified" status="commendable" name="newObject" fullname="QScriptEngine::newObject" href="qscriptengine.html#newObject" location="qscriptengine.h" virtual="non" meta="plain" const="false" static="false" overload="false" type="QScriptValue" signature="newObject()"/>
             <function access="public" threadsafety="unspecified" status="commendable" name="newObject" fullname="QScriptEngine::newObject" href="qscriptengine.html#newObject-2" location="qscriptengine.h" virtual="non" meta="plain" const="false" static="false" overload="true" overload-number="2" type="QScriptValue" signature="newObject(QScriptClass * scriptClass, const QScriptValue &amp; data)">
diff --git a/qtscriptclassic/src/qscriptcontext_p.cpp b/qtscriptclassic/src/qscriptcontext_p.cpp
index 71e95786..19a6987a 100644
--- a/qtscriptclassic/src/qscriptcontext_p.cpp
+++ b/qtscriptclassic/src/qscriptcontext_p.cpp
@@ -810,9 +810,9 @@ void QScriptContextPrivate::execute(QScript::Code *code)
         }
 
 #ifndef QT_NO_REGEXP
-        QRegExp rx;
+        QRegularExpression rx;
         // lazy compilation of regexp literals
-        QHash<QString, QRegExp>::const_iterator it;
+        QHash<QString, QRegularExpression>::const_iterator it;
         it = eng->m_regExpLiterals.constFind(literal);
         if (it == eng->m_regExpLiterals.constEnd()) {
             rx = QScript::Ecma::RegExp::toRegExp(pattern, flags);
diff --git a/qtscriptclassic/src/qscriptecmadate.cpp b/qtscriptclassic/src/qscriptecmadate.cpp
index 8247a32a..6070face 100644
--- a/qtscriptclassic/src/qscriptecmadate.cpp
+++ b/qtscriptclassic/src/qscriptecmadate.cpp
@@ -12,7 +12,7 @@
 #include "qscriptobject_p.h"
 
 #include <QDateTime>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QtDebug>
 #include <QLocale>
 #include <qnumeric.h>
diff --git a/qtscriptclassic/src/qscriptecmaregexp.cpp b/qtscriptclassic/src/qscriptecmaregexp.cpp
index bfa0115d..f08cbd44 100644
--- a/qtscriptclassic/src/qscriptecmaregexp.cpp
+++ b/qtscriptclassic/src/qscriptecmaregexp.cpp
@@ -12,7 +12,7 @@
 #include "qscriptobject_p.h"
 
 #include <QStringList>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QtDebug>
 
 QT_BEGIN_NAMESPACE
@@ -110,7 +110,7 @@ void RegExp::execute(QScriptContextPrivate *context)
 void RegExp::newRegExp(QScriptValueImpl *result, const QString &pattern, int flags)
 {
 #ifndef QT_NO_REGEXP
-    QRegExp rx = toRegExp(pattern, flags);
+    QRegularExpression rx = toRegExp(pattern, flags);
     newRegExp_helper(result, rx, flags);
 #else
     engine()->newObject(result, publicPrototype, classInfo());
@@ -119,39 +119,39 @@ void RegExp::newRegExp(QScriptValueImpl *result, const QString &pattern, int fla
 }
 
 #ifndef QT_NO_REGEXP
-void RegExp::newRegExp(QScriptValueImpl *result, const QRegExp &rx, int flags)
+void RegExp::newRegExp(QScriptValueImpl *result, const QRegularExpression &rx, int flags)
 {
     Q_ASSERT(!(flags & IgnoreCase) || (rx.caseSensitivity() == Qt::CaseInsensitive));
     newRegExp_helper(result, rx, flags);
 }
 
-void RegExp::newRegExp_helper(QScriptValueImpl *result, const QRegExp &rx,
+void RegExp::newRegExp_helper(QScriptValueImpl *result, const QRegularExpression &rx,
                               int flags)
 {
     engine()->newObject(result, publicPrototype, classInfo());
     initRegExp(result, rx, flags);
 }
 
-QRegExp RegExp::toRegExp(const QScriptValueImpl &value) const
+QRegularExpression RegExp::toRegExp(const QScriptValueImpl &value) const
 {
     Instance *rx_data = Instance::get(value, classInfo());
     Q_ASSERT(rx_data != 0);
     return rx_data->value;
 }
 
-QRegExp RegExp::toRegExp(const QString &pattern, int flags)
+QRegularExpression RegExp::toRegExp(const QString &pattern, int flags)
 {
     bool ignoreCase = (flags & IgnoreCase) != 0;
-    return QRegExp(pattern,
+    return QRegularExpression(pattern,
                    (ignoreCase ? Qt::CaseInsensitive: Qt::CaseSensitive),
-                   QRegExp::RegExp2);
+                   QRegularExpression::RegExp2);
 }
 
 #endif // QT_NO_REGEXP
 
 void RegExp::initRegExp(QScriptValueImpl *result,
 #ifndef QT_NO_REGEXP
-                        const QRegExp &rx,
+                        const QRegularExpression &rx,
 #else
                         const QString &pattern,
 #endif
diff --git a/qtscriptclassic/src/qscriptecmaregexp_p.h b/qtscriptclassic/src/qscriptecmaregexp_p.h
index cc4cb71a..aa3b9b76 100644
--- a/qtscriptclassic/src/qscriptecmaregexp_p.h
+++ b/qtscriptclassic/src/qscriptecmaregexp_p.h
@@ -16,7 +16,7 @@
 // We mean it.
 //
 
-#include <QRegExp>
+#include <QRegularExpression>
 
 
 #include "qscriptecmacore_p.h"
@@ -49,7 +49,7 @@ class RegExp: public Core
 
     public: // attributes
 #ifndef QT_NO_REGEXP
-        QRegExp value;
+        QRegularExpression value;
 #else
         QString pattern;
 #endif
@@ -62,10 +62,10 @@ class RegExp: public Core
     void newRegExp(QScriptValueImpl *result, const QString &pattern,
                    int flags);
 #ifndef QT_NO_REGEXP
-    void newRegExp(QScriptValueImpl *result, const QRegExp &rx,
+    void newRegExp(QScriptValueImpl *result, const QRegularExpression &rx,
                    int flags = 0);
-    QRegExp toRegExp(const QScriptValueImpl &value) const;
-    static QRegExp toRegExp(const QString &pattern, int flags);
+    QRegularExpression toRegExp(const QScriptValueImpl &value) const;
+    static QRegularExpression toRegExp(const QString &pattern, int flags);
 #endif
 
     static int flagFromChar(const QChar &ch);
@@ -84,12 +84,12 @@ class RegExp: public Core
 
 private:
 #ifndef QT_NO_REGEXP
-    void newRegExp_helper(QScriptValueImpl *result, const QRegExp &rx,
+    void newRegExp_helper(QScriptValueImpl *result, const QRegularExpression &rx,
                           int flags);
 #endif
     void initRegExp(QScriptValueImpl *result,
 #ifndef QT_NO_REGEXP
-                    const QRegExp &rx,
+                    const QRegularExpression &rx,
 #else
                     const QString &pattern,
 #endif
diff --git a/qtscriptclassic/src/qscriptengine.cpp b/qtscriptclassic/src/qscriptengine.cpp
index 9dd546dc..f2106729 100644
--- a/qtscriptclassic/src/qscriptengine.cpp
+++ b/qtscriptclassic/src/qscriptengine.cpp
@@ -417,7 +417,7 @@ QScriptValue QScriptEngine::newFunction(QScriptEngine::FunctionSignature fun,
 
   \sa QScriptValue::toRegExp()
 */
-QScriptValue QScriptEngine::newRegExp(const QRegExp &regexp)
+QScriptValue QScriptEngine::newRegExp(const QRegularExpression &regexp)
 {
     Q_D(QScriptEngine);
     QScriptValueImpl v;
diff --git a/qtscriptclassic/src/qscriptengine.h b/qtscriptclassic/src/qscriptengine.h
index ab676991..ae13faeb 100644
--- a/qtscriptclassic/src/qscriptengine.h
+++ b/qtscriptclassic/src/qscriptengine.h
@@ -42,7 +42,7 @@ inline QScriptValue qscriptQMetaObjectConstructor(QScriptContext *, QScriptEngin
 #endif // QT_NO_QOBJECT
 
 #ifndef QT_NO_REGEXP
-class QRegExp;
+class QRegularExpression;
 #endif
 
 #ifndef QT_NO_MEMBER_TEMPLATES
@@ -152,7 +152,7 @@ class Q_SCRIPT_EXPORT QScriptEngine
     QScriptValue newVariant(const QScriptValue &object, const QVariant &value);
 
 #ifndef QT_NO_REGEXP
-    QScriptValue newRegExp(const QRegExp &regexp);
+    QScriptValue newRegExp(const QRegularExpression &regexp);
 #endif
 
     QScriptValue newObject();
diff --git a/qtscriptclassic/src/qscriptengine_p.cpp b/qtscriptclassic/src/qscriptengine_p.cpp
index 050c4e1c..5b3964df 100644
--- a/qtscriptclassic/src/qscriptengine_p.cpp
+++ b/qtscriptclassic/src/qscriptengine_p.cpp
@@ -26,7 +26,7 @@
 
 #include <QDate>
 #include <QDateTime>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QStringList>
 #include <QVariant>
 
@@ -1386,8 +1386,8 @@ QScriptValueImpl QScriptEnginePrivate::create(int type, const void *ptr)
             dateConstructor->newDate(&result, date);
         } break;
 #ifndef QT_NO_REGEXP
-        case QMetaType::QRegExp: {
-            QRegExp rx = *reinterpret_cast<const QRegExp *>(ptr);
+        case QMetaType::QRegularExpression: {
+            QRegularExpression rx = *reinterpret_cast<const QRegularExpression *>(ptr);
             regexpConstructor->newRegExp(&result, rx);
         } break;
 #endif
@@ -1508,9 +1508,9 @@ bool QScriptEnginePrivate::convert(const QScriptValueImpl &value,
             return true;
         } break;
 #ifndef QT_NO_REGEXP
-    case QMetaType::QRegExp:
+    case QMetaType::QRegularExpression:
         if (value.isRegExp()) {
-            *reinterpret_cast<QRegExp *>(ptr) = value.toRegExp();
+            *reinterpret_cast<QRegularExpression *>(ptr) = value.toRegExp();
             return true;
         } break;
 #endif
diff --git a/qtscriptclassic/src/qscriptenginefwd_p.h b/qtscriptclassic/src/qscriptenginefwd_p.h
index f47e5ab5..a67fb0db 100644
--- a/qtscriptclassic/src/qscriptenginefwd_p.h
+++ b/qtscriptclassic/src/qscriptenginefwd_p.h
@@ -14,7 +14,7 @@
 
 #include <QHash>
 #include <QList>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QSet>
 #include <QStringList>
 #include <QTime>
@@ -488,7 +488,7 @@ class QScriptEnginePrivate
     QSet<QScriptObject*> visitedArrayElements;
 
 #ifndef QT_NO_REGEXP
-    QHash<QString, QRegExp> m_regExpLiterals;
+    QHash<QString, QRegularExpression> m_regExpLiterals;
 #endif
 
     QScript::IdTable m_id_table;
diff --git a/qtscriptclassic/src/qscriptextqobject.cpp b/qtscriptclassic/src/qscriptextqobject.cpp
index ff084c86..16605204 100644
--- a/qtscriptclassic/src/qscriptextqobject.cpp
+++ b/qtscriptclassic/src/qscriptextqobject.cpp
@@ -16,7 +16,7 @@
 
 #include <QtDebug>
 #include <QMetaMethod>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QVarLengthArray>
 #include <QPointer>
 
@@ -485,7 +485,7 @@ static void callQtMethod(QScriptContextPrivate *context, QMetaMethod::MethodType
                     }
                 } else if (actual.isRegExp()) {
                     switch (tid) {
-                    case QMetaType::QRegExp:
+                    case QMetaType::QRegularExpression:
                         // perfect
                         break;
                     default:
@@ -1482,7 +1482,7 @@ QScriptValueImpl QScript::ExtQObject::method_findChildren(QScriptContextPrivate
         QScriptValueImpl arg = context->argument(0);
 #ifndef QT_NO_REGEXP
         if (arg.isRegExp()) {
-            QRegExp re = arg.toRegExp();
+            QRegularExpression re = arg.toRegExp();
             found = qFindChildren<QObject*>(obj, re);
         } else
 #endif
diff --git a/qtscriptclassic/src/qscriptvalue.cpp b/qtscriptclassic/src/qscriptvalue.cpp
index 961d8327..041b4bdb 100644
--- a/qtscriptclassic/src/qscriptvalue.cpp
+++ b/qtscriptclassic/src/qscriptvalue.cpp
@@ -15,7 +15,7 @@
 #include "qscriptclass_p.h"
 
 #include <QDateTime>
-#include <QRegExp>
+#include <QRegularExpression>
 
 QT_BEGIN_NAMESPACE
 
@@ -917,17 +917,17 @@ QDateTime QScriptValue::toDateTime() const
 
 #ifndef QT_NO_REGEXP
 /*!
-  Returns the QRegExp representation of this value.
+  Returns the QRegularExpression representation of this value.
   If this QScriptValue is not a regular expression, an empty
-  QRegExp is returned.
+  QRegularExpression is returned.
 
   \sa isRegExp()
 */
-QRegExp QScriptValue::toRegExp() const
+QRegularExpression QScriptValue::toRegExp() const
 {
     Q_D(const QScriptValue);
     if (!d)
-        return QRegExp();
+        return QRegularExpression();
     return d->value.toRegExp();
 }
 #endif // QT_NO_REGEXP
diff --git a/qtscriptclassic/src/qscriptvalue.h b/qtscriptclassic/src/qscriptvalue.h
index 04f043e9..6aa10a8d 100644
--- a/qtscriptclassic/src/qscriptvalue.h
+++ b/qtscriptclassic/src/qscriptvalue.h
@@ -25,7 +25,7 @@ class QObject;
 struct QMetaObject;
 class QDateTime;
 #ifndef QT_NO_REGEXP
-class QRegExp;
+class QRegularExpression;
 #endif
 
 typedef QList<QScriptValue> QScriptValueList;
@@ -126,7 +126,7 @@ class Q_SCRIPT_EXPORT QScriptValue
     QScriptValue toObject() const;
     QDateTime toDateTime() const;
 #ifndef QT_NO_REGEXP
-    QRegExp toRegExp() const;
+    QRegularExpression toRegExp() const;
 #endif
 
     bool instanceOf(const QScriptValue &other) const;
diff --git a/qtscriptclassic/src/qscriptvalueimpl_p.h b/qtscriptclassic/src/qscriptvalueimpl_p.h
index ea6f935a..3bc786e1 100644
--- a/qtscriptclassic/src/qscriptvalueimpl_p.h
+++ b/qtscriptclassic/src/qscriptvalueimpl_p.h
@@ -284,10 +284,10 @@ inline QDateTime QScriptValueImpl::toDateTime() const
 }
 
 #ifndef QT_NO_REGEXP
-inline QRegExp QScriptValueImpl::toRegExp() const
+inline QRegularExpression QScriptValueImpl::toRegExp() const
 {
     if (!isRegExp())
-        return QRegExp();
+        return QRegularExpression();
     return engine()->regexpConstructor->toRegExp(*this);
 }
 #endif // QT_NO_REGEXP
diff --git a/qtscriptclassic/src/qscriptvalueimplfwd_p.h b/qtscriptclassic/src/qscriptvalueimplfwd_p.h
index c482edd0..27130ea3 100644
--- a/qtscriptclassic/src/qscriptvalueimplfwd_p.h
+++ b/qtscriptclassic/src/qscriptvalueimplfwd_p.h
@@ -103,7 +103,7 @@ class QScriptValueImpl
     inline const QMetaObject *toQMetaObject() const;
     inline QDateTime toDateTime() const;
 #ifndef QT_NO_REGEXP
-    inline QRegExp toRegExp() const;
+    inline QRegularExpression toRegExp() const;
 #endif
 
     inline QVariant &variantValue() const;
diff --git a/qtservice/doc/html/qtservice-example-server.html b/qtservice/doc/html/qtservice-example-server.html
index 5f780b12..d29e7b00 100644
--- a/qtservice/doc/html/qtservice-example-server.html
+++ b/qtservice/doc/html/qtservice-example-server.html
@@ -64,7 +64,7 @@
          <span class="comment">// document back.</span>
          QTcpSocket* socket = (QTcpSocket*)sender();
          if (socket-&gt;canReadLine()) {
-             QStringList tokens = QString(socket-&gt;readLine()).split(QRegExp(&quot;[ \r\n][ \r\n]*&quot;));
+             QStringList tokens = QString(socket-&gt;readLine()).split(QRegularExpression(&quot;[ \r\n][ \r\n]*&quot;));
              if (tokens[0] == &quot;GET&quot;) {
                  QTextStream os(socket);
                  os.setAutoDetectUnicode(true);
diff --git a/qtservice/examples/server/main.cpp b/qtservice/examples/server/main.cpp
index c3f271de..9acabcb7 100644
--- a/qtservice/examples/server/main.cpp
+++ b/qtservice/examples/server/main.cpp
@@ -61,7 +61,7 @@ private slots:
         // document back.
         QTcpSocket* socket = (QTcpSocket*)sender();
         if (socket->canReadLine()) {
-            QStringList tokens = QString(socket->readLine()).split(QRegExp("[ \r\n][ \r\n]*"));
+            QStringList tokens = QString(socket->readLine()).split(QRegularExpression("[ \r\n][ \r\n]*"));
             if (tokens[0] == "GET") {
                 QTextStream os(socket);
                 os.setAutoDetectUnicode(true);
diff --git a/qtsingleapplication/doc/html/qtsingleapplication-members.html b/qtsingleapplication/doc/html/qtsingleapplication-members.html
index c995ce3f..b91332b5 100644
--- a/qtsingleapplication/doc/html/qtsingleapplication-members.html
+++ b/qtsingleapplication/doc/html/qtsingleapplication-members.html
@@ -81,7 +81,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qcoreapplication.html#filterEvent">filterEvent</a></b> ( void *, long * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qcoreapplication.html#flush">flush</a></b> ()</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qapplication.html#focusChanged">focusChanged</a></b> ( QWidget *, QWidget * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qapplication.html#focusWidget">focusWidget</a></b> ()</div></li>
diff --git a/qtsingleapplication/doc/html/qtsinglecoreapplication-members.html b/qtsingleapplication/doc/html/qtsinglecoreapplication-members.html
index 69fb8581..a7011f52 100644
--- a/qtsingleapplication/doc/html/qtsinglecoreapplication-members.html
+++ b/qtsingleapplication/doc/html/qtsinglecoreapplication-members.html
@@ -53,7 +53,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qcoreapplication.html#filterEvent">filterEvent</a></b> ( void *, long * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qcoreapplication.html#flush">flush</a></b> ()</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qcoreapplication.html#hasPendingEvents">hasPendingEvents</a></b> ()</div></li>
 <li><div class="fn"><b><a href="qtsinglecoreapplication.html#id">id</a></b> () const : QString</div></li>
diff --git a/qtsoap/doc/html/qtsoaphttptransport-members.html b/qtsoap/doc/html/qtsoaphttptransport-members.html
index 994e3f61..2ada5037 100644
--- a/qtsoap/doc/html/qtsoaphttptransport-members.html
+++ b/qtsoap/doc/html/qtsoaphttptransport-members.html
@@ -39,7 +39,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#eventFilter">eventFilter</a></b> ( QObject *, QEvent * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="qtsoaphttptransport.html#getResponse">getResponse</a></b> () const : const QtSoapMessage &amp;</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#inherits">inherits</a></b> ( const char * ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#installEventFilter">installEventFilter</a></b> ( QObject * )</div></li>
diff --git a/qtwinmigrate/doc/html/qmfcapp-members.html b/qtwinmigrate/doc/html/qmfcapp-members.html
index 89490a6e..c8d52512 100644
--- a/qtwinmigrate/doc/html/qmfcapp-members.html
+++ b/qtwinmigrate/doc/html/qmfcapp-members.html
@@ -76,7 +76,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qcoreapplication.html#filterEvent">filterEvent</a></b> ( void *, long * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qcoreapplication.html#flush">flush</a></b> ()</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qapplication.html#focusChanged">focusChanged</a></b> ( QWidget *, QWidget * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qapplication.html#focusWidget">focusWidget</a></b> ()</div></li>
diff --git a/qtwinmigrate/doc/html/qwinhost-members.html b/qtwinmigrate/doc/html/qwinhost-members.html
index d72d09cb..506e5ef8 100644
--- a/qtwinmigrate/doc/html/qwinhost-members.html
+++ b/qtwinmigrate/doc/html/qwinhost-members.html
@@ -82,7 +82,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qwidget.html#find">find</a></b> ( WId )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="qwinhost.html#focusInEvent">focusInEvent</a></b> ( QFocusEvent * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qwidget.html#focusNextChild">focusNextChild</a></b> ()</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qwidget.html#focusNextPrevChild">focusNextPrevChild</a></b> ( bool )</div></li>
diff --git a/qtwinmigrate/doc/html/qwinwidget-members.html b/qtwinmigrate/doc/html/qwinwidget-members.html
index ea8d51f5..538c7928 100644
--- a/qtwinmigrate/doc/html/qwinwidget-members.html
+++ b/qtwinmigrate/doc/html/qwinwidget-members.html
@@ -82,7 +82,7 @@
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qwidget.html#find">find</a></b> ( WId )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChild">findChild</a></b> ( const QString &amp; ) const</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren">findChildren</a></b> ( const QString &amp; ) const</div></li>
-<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegExp &amp; ) const</div></li>
+<li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qobject.html#findChildren-2">findChildren</a></b> ( const QRegularExpression &amp; ) const</div></li>
 <li><div class="fn"><b><a href="qwinwidget.html#focusInEvent">focusInEvent</a></b> ( QFocusEvent * )</div></li>
 <li><div class="fn"><b><a href="http://qt.nokia.com/doc/4.6/qwidget.html#focusNextChild">focusNextChild</a></b> ()</div></li>
 <li><div class="fn"><b><a href="qwinwidget.html#focusNextPrevChild">focusNextPrevChild</a></b> ( bool ) : bool</div></li>