Merge branch 'dev' into stable

This starts Qt 5.1 release cycle

Conflicts:
	src/gui/text/qfontdatabase.cpp
	src/gui/text/qharfbuzz_copy_p.h
	src/widgets/kernel/qapplication.cpp
	src/widgets/kernel/qcoreapplication.cpp

Change-Id: I72fbf83ab3c2206aeea1b089428b0fc2a89bd62b

37 files changed, 1382 insertions, 551 deletions

diff --git a/tests/auto/gui/image/image.pro b/tests/auto/gui/image/image.pro
index 1ef52df4ba..9199763c40 100644
--- a/tests/auto/gui/image/image.pro
+++ b/tests/auto/gui/image/image.pro
@@ -11,6 +11,9 @@ SUBDIRS=\
    qpicture \
    qicon \
 
+!qtHaveModule(network): SUBDIRS -= \
+    qimagereader
+
 !contains(QT_CONFIG, private_tests): SUBDIRS -= \
            qpixmapcache \
 
diff --git a/tests/auto/gui/image/qicon/tst_qicon.cpp b/tests/auto/gui/image/qicon/tst_qicon.cpp
index 11fd5f9b2e..c21f725b55 100644
--- a/tests/auto/gui/image/qicon/tst_qicon.cpp
+++ b/tests/auto/gui/image/qicon/tst_qicon.cpp
@@ -80,7 +80,7 @@ private:
     const static QIcon staticIcon;
 };
 
-// Creating an icon statically should not cause a crash. 
+// Creating an icon statically should not cause a crash.
 // But we do not officially support this. See QTBUG-8666
 const QIcon tst_QIcon::staticIcon = QIcon::fromTheme("edit-find");
 
diff --git a/tests/auto/gui/image/qimageiohandler/tst_qimageiohandler.cpp b/tests/auto/gui/image/qimageiohandler/tst_qimageiohandler.cpp
index d76e954ccd..f7d8eef721 100644
--- a/tests/auto/gui/image/qimageiohandler/tst_qimageiohandler.cpp
+++ b/tests/auto/gui/image/qimageiohandler/tst_qimageiohandler.cpp
@@ -63,7 +63,7 @@ class MyImageIOHandler : public QImageIOHandler
 {
 public:
     MyImageIOHandler() : QImageIOHandler() { }
-    bool canRead() const { return true; }    
+    bool canRead() const { return true; }
     bool read(QImage *) { return true; }
 };
 
diff --git a/tests/auto/gui/image/qimagereader/images/black.xpm b/tests/auto/gui/image/qimagereader/images/black.xpm
index d7925bf211..4a1f4ec861 100644
--- a/tests/auto/gui/image/qimagereader/images/black.xpm
+++ b/tests/auto/gui/image/qimagereader/images/black.xpm
@@ -15,21 +15,21 @@ static char * ddd_xpm[] = {
 "+ c white     m white g white  g4 white  s Light      ",
 "*      c DarkGreen m black g grey25 g4 grey25 s Eye        ",
 /* Pixels */
-"                .            .                  ",    
-"                .           ..                  ",    
-"                 .          .                   ",    
-"                 ..        .                    ",    
-"   ..             ..      ..                    ",    
-"     ..            .     .               .      ",    
-"       .            . . .              ..       ",    
-"        .            .X.              .         ",    
-"         .          *.X.*           ..          ",    
-"         ..     ..  .XXX.  ..     ...           ",    
-"          .     .X...XXX...X.     .             ",    
-"          ..   ..XXX.XXX.XXX.   ..              ",    
-"            .....XXXX...XXXX.   .               ",    
-"             .. ..XXXXXXXXX.. ..                ",    
-"                ...XXXXXXX.....                 ",    
+"                .            .                  ",
+"                .           ..                  ",
+"                 .          .                   ",
+"                 ..        .                    ",
+"   ..             ..      ..                    ",
+"     ..            .     .               .      ",
+"       .            . . .              ..       ",
+"        .            .X.              .         ",
+"         .          *.X.*           ..          ",
+"         ..     ..  .XXX.  ..     ...           ",
+"          .     .X...XXX...X.     .             ",
+"          ..   ..XXX.XXX.XXX.   ..              ",
+"            .....XXXX...XXXX.   .               ",
+"             .. ..XXXXXXXXX.. ..                ",
+"                ...XXXXXXX.....                 ",
 "                  .........                     ",
 "                  .XXXXXXX.                     ",
 "                .....XXX.....                   ",
diff --git a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
index 4b3db26685..b684231e10 100644
--- a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
+++ b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
@@ -94,6 +94,7 @@ private slots:
     void multiWordNamedColorXPM();
 
     void supportedFormats();
+    void supportedMimeTypes();
 
     void readFromDevice_data();
     void readFromDevice();
@@ -571,6 +572,26 @@ void tst_QImageReader::supportedFormats()
     QCOMPARE(formatSet.size(), formats.size());
 }
 
+void tst_QImageReader::supportedMimeTypes()
+{
+    QList<QByteArray> mimeTypes = QImageReader::supportedMimeTypes();
+    QList<QByteArray> sortedMimeTypes = mimeTypes;
+    qSort(sortedMimeTypes);
+
+    // check that the list is sorted
+    QCOMPARE(mimeTypes, sortedMimeTypes);
+
+    QSet<QByteArray> mimeTypeSet;
+    foreach (QByteArray mimeType, mimeTypes)
+        mimeTypeSet << mimeType;
+
+    // check the list as a minimum contains image/bmp
+    QVERIFY(mimeTypeSet.contains("image/bmp"));
+
+    // check that the list does not contain duplicates
+    QCOMPARE(mimeTypeSet.size(), mimeTypes.size());
+}
+
 void tst_QImageReader::setBackgroundColor_data()
 {
     QTest::addColumn<QString>("fileName");
diff --git a/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp b/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp
index 3c36482d62..f1d0e227f6 100644
--- a/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp
+++ b/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp
@@ -81,6 +81,7 @@ private slots:
     void writeImage2_data();
     void writeImage2();
     void supportedFormats();
+    void supportedMimeTypes();
 
     void writeToInvalidDevice();
 
@@ -352,6 +353,26 @@ void tst_QImageWriter::supportedFormats()
     QCOMPARE(formatSet.size(), formats.size());
 }
 
+void tst_QImageWriter::supportedMimeTypes()
+{
+    QList<QByteArray> mimeTypes = QImageWriter::supportedMimeTypes();
+    QList<QByteArray> sortedMimeTypes = mimeTypes;
+    qSort(sortedMimeTypes);
+
+    // check that the list is sorted
+    QCOMPARE(mimeTypes, sortedMimeTypes);
+
+    QSet<QByteArray> mimeTypeSet;
+    foreach (QByteArray mimeType, mimeTypes)
+        mimeTypeSet << mimeType;
+
+    // check the list as a minimum contains image/bmp
+    QVERIFY(mimeTypeSet.contains("image/bmp"));
+
+    // check that the list does not contain duplicates
+    QCOMPARE(mimeTypeSet.size(), mimeTypes.size());
+}
+
 void tst_QImageWriter::writeToInvalidDevice()
 {
     QLatin1String fileName("/these/directories/do/not/exist/001.png");
diff --git a/tests/auto/gui/image/qpicture/tst_qpicture.cpp b/tests/auto/gui/image/qpicture/tst_qpicture.cpp
index 3e628981b6..2e766c5bf5 100644
--- a/tests/auto/gui/image/qpicture/tst_qpicture.cpp
+++ b/tests/auto/gui/image/qpicture/tst_qpicture.cpp
@@ -174,28 +174,28 @@ void tst_QPicture::operator_lt_lt()
 {
     // streaming of null pictures
     {
-	QPicture pic1, pic2;
-	QByteArray ba( 100, 0 );
-	QDataStream str1( &ba, QIODevice::WriteOnly );
-	str1 << pic1;
-	QDataStream str2( &ba, QIODevice::ReadOnly );
-	str2 >> pic2;
- 	QVERIFY( pic2.isNull() );
+        QPicture pic1, pic2;
+        QByteArray ba( 100, 0 );
+        QDataStream str1( &ba, QIODevice::WriteOnly );
+        str1 << pic1;
+        QDataStream str2( &ba, QIODevice::ReadOnly );
+        str2 >> pic2;
+        QVERIFY( pic2.isNull() );
     }
 
     // picture with a simple line, checking bitwise equality
     {
-	QPicture pic1, pic2;
-	QPainter p( &pic1 );
-	p.drawLine( 10, 20, 30, 40 );
-	p.end();
-	QByteArray ba( 10 * pic1.size(), 0 );
-	QDataStream str1( &ba, QIODevice::WriteOnly );
-	str1 << pic1;
-	QDataStream str2( &ba, QIODevice::ReadOnly );
-	str2 >> pic2;
-	QCOMPARE( pic1.size(), pic2.size() );
-	QVERIFY( memcmp( pic1.data(), pic2.data(), pic1.size() ) == 0 );
+        QPicture pic1, pic2;
+        QPainter p( &pic1 );
+        p.drawLine( 10, 20, 30, 40 );
+        p.end();
+        QByteArray ba( 10 * pic1.size(), 0 );
+        QDataStream str1( &ba, QIODevice::WriteOnly );
+        str1 << pic1;
+        QDataStream str2( &ba, QIODevice::ReadOnly );
+        str2 >> pic2;
+        QCOMPARE( pic1.size(), pic2.size() );
+        QVERIFY( memcmp( pic1.data(), pic2.data(), pic1.size() ) == 0 );
     }
 }
 
@@ -268,7 +268,6 @@ void tst_QPicture::boundaryValues_data()
 
     QTest::newRow("min x, max y") << INT_MIN << INT_MAX;
     QTest::newRow("max x, min y") << INT_MAX << INT_MIN;
-
 }
 
 void tst_QPicture::boundaryValues()
@@ -283,8 +282,6 @@ void tst_QPicture::boundaryValues()
     painter.drawPoint(QPoint(x, y));
 
     painter.end();
-
-    
 }
 
 
diff --git a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
index 61f53a5073..531ec68fdc 100644
--- a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
+++ b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
@@ -114,6 +114,7 @@ private slots:
 
     void convertFromImageNoDetach();
     void convertFromImageDetach();
+    void convertFromImageCacheKey();
 
 #if defined(Q_OS_WIN)
     void toWinHBITMAP_data();
@@ -782,6 +783,28 @@ void tst_QPixmap::convertFromImageDetach()
     QVERIFY(copy.isDetached());
 }
 
+void tst_QPixmap::convertFromImageCacheKey()
+{
+    QPixmap randomPixmap(10, 10);
+    if (randomPixmap.handle()->classId() != QPlatformPixmap::RasterClass)
+        QSKIP("Test only valid for raster pixmaps");
+
+    //first get the screen format
+    QImage::Format screenFormat = randomPixmap.toImage().format();
+    QVERIFY(screenFormat != QImage::Format_Invalid);
+
+    QImage orig(100,100, screenFormat);
+    orig.fill(0);
+
+    QPixmap pix = QPixmap::fromImage(orig);
+    QImage copy = pix.toImage();
+
+    QVERIFY(copy.format() == screenFormat);
+
+    QCOMPARE(orig.cacheKey(), pix.cacheKey());
+    QCOMPARE(copy.cacheKey(), pix.cacheKey());
+}
+
 #if defined(Q_OS_WIN)
 
 QT_BEGIN_NAMESPACE
diff --git a/tests/auto/gui/itemmodels/qstandarditem/tst_qstandarditem.cpp b/tests/auto/gui/itemmodels/qstandarditem/tst_qstandarditem.cpp
index 649bc071b9..5406256c9f 100644
--- a/tests/auto/gui/itemmodels/qstandarditem/tst_qstandarditem.cpp
+++ b/tests/auto/gui/itemmodels/qstandarditem/tst_qstandarditem.cpp
@@ -187,7 +187,7 @@ void tst_QStandardItem::getSetData()
             item.setBackground(backgroundColor);
             QCOMPARE(item.background().color(), backgroundColor);
 
-            QColor textColor((i == i) ? Qt::green : Qt::cyan);
+            QColor textColor((i == 1) ? Qt::green : Qt::cyan);
             item.setForeground(textColor);
             QCOMPARE(item.foreground().color(), textColor);
 
diff --git a/tests/auto/gui/kernel/kernel.pro b/tests/auto/gui/kernel/kernel.pro
index 7e3f25d377..85a81de632 100644
--- a/tests/auto/gui/kernel/kernel.pro
+++ b/tests/auto/gui/kernel/kernel.pro
@@ -15,6 +15,7 @@ SUBDIRS=\
    qmouseevent_modal \
    qpalette \
    qscreen \
+   qsurfaceformat \
    qtouchevent \
    qwindow \
    qguiapplication \
diff --git a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
index a2ee14db45..a6134de497 100644
--- a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
+++ b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
@@ -133,6 +133,10 @@ private slots:
     void parseString();
     void fromString_data();
     void fromString();
+    void listToString_data();
+    void listToString();
+    void listFromString_data();
+    void listFromString();
 #ifdef QT_BUILD_INTERNAL
     void ensureSorted();
 #endif
@@ -631,6 +635,104 @@ void tst_QKeySequence::fromString()
     QCOMPARE(ks4, ks1);
 }
 
+void tst_QKeySequence::listToString_data()
+{
+    QTest::addColumn<QString>("strSequences");
+    QTest::addColumn<QList<QKeySequence> >("sequences");
+
+    QList<QKeySequence> sequences;
+
+    sequences << QKeySequence(Qt::CTRL + Qt::Key_Left)
+              << QKeySequence(Qt::META + Qt::Key_A);
+    QTest::newRow("Ctrl+Left; Meta+A") << "Ctrl+Left; Meta+A" << sequences;
+
+    sequences.clear();
+    sequences << QKeySequence(Qt::CTRL + Qt::Key_Semicolon)
+              << QKeySequence(Qt::META + Qt::Key_A);
+    QTest::newRow("Ctrl+;; Meta+A") << "Ctrl+;; Meta+A" << sequences;
+
+    sequences.clear();
+    sequences << QKeySequence(Qt::Key_Semicolon)
+              << QKeySequence(Qt::META + Qt::Key_A);
+    QTest::newRow(";; Meta+A") << ";; Meta+A" << sequences;
+
+    sequences.clear();
+    sequences << QKeySequence(Qt::CTRL + Qt::Key_Left)
+              << QKeySequence(Qt::META + Qt::Key_Semicolon);
+    QTest::newRow("Ctrl+Left; Meta+;") << "Ctrl+Left; Meta+;" << sequences;
+
+    sequences.clear();
+    sequences << QKeySequence(Qt::CTRL + Qt::Key_Left)
+              << QKeySequence();
+    QTest::newRow("Ctrl+Left; ") << "Ctrl+Left; " << sequences;
+
+    sequences.clear();
+    sequences << QKeySequence(Qt::CTRL + Qt::Key_Left)
+              << QKeySequence()
+              << QKeySequence(Qt::META + Qt::Key_A);
+    QTest::newRow("Ctrl+Left; ; Meta+A") << "Ctrl+Left; ; Meta+A" << sequences;
+}
+
+void tst_QKeySequence::listToString()
+{
+    QFETCH(QList<QKeySequence>, sequences);
+    QFETCH(QString, strSequences);
+
+    QCOMPARE(QKeySequence::listToString(sequences), strSequences);
+}
+
+void tst_QKeySequence::listFromString_data()
+{
+    QTest::addColumn<QString>("strSequences");
+    QTest::addColumn<QList<QKeySequence> >("sequences");
+
+    QList<QKeySequence> sequences;
+
+    sequences << QKeySequence(Qt::CTRL + Qt::Key_Left)
+              << QKeySequence(Qt::META + Qt::Key_A);
+    QTest::newRow("Ctrl+Left; Meta+A") << "Ctrl+Left; Meta+A" << sequences;
+
+    sequences.clear();
+    sequences << QKeySequence(Qt::CTRL + Qt::Key_Semicolon)
+              << QKeySequence(Qt::META + Qt::Key_A);
+    QTest::newRow("Ctrl+;; Meta+A") << "Ctrl+;; Meta+A" << sequences;
+
+    sequences.clear();
+    sequences << QKeySequence(Qt::Key_Semicolon)
+              << QKeySequence(Qt::META + Qt::Key_A);
+    QTest::newRow(";; Meta+A") << ";; Meta+A" << sequences;
+
+    sequences.clear();
+    sequences << QKeySequence(Qt::CTRL + Qt::Key_Left)
+              << QKeySequence(Qt::META + Qt::Key_Semicolon);
+    QTest::newRow("Ctrl+Left; Meta+;") << "Ctrl+Left; Meta+;" << sequences;
+
+    sequences.clear();
+    sequences << QKeySequence(Qt::CTRL + Qt::Key_Left)
+              << QKeySequence();
+    QTest::newRow("Ctrl+Left; ") << "Ctrl+Left; " << sequences;
+
+    sequences.clear();
+    sequences << QKeySequence(Qt::CTRL + Qt::Key_Left)
+              << QKeySequence()
+              << QKeySequence(Qt::META + Qt::Key_A);
+    QTest::newRow("Ctrl+Left; ; Meta+A") << "Ctrl+Left; ; Meta+A" << sequences;
+
+    sequences.clear();
+    sequences << QKeySequence(Qt::CTRL + Qt::Key_Left)
+              << QKeySequence(Qt::Key_unknown)
+              << QKeySequence(Qt::META + Qt::Key_A);
+    QTest::newRow("Ctrl+Left; 4+3=2; Meta+A") << "Ctrl+Left; 4+3=2; Meta+A" << sequences;
+}
+
+void tst_QKeySequence::listFromString()
+{
+    QFETCH(QList<QKeySequence>, sequences);
+    QFETCH(QString, strSequences);
+
+    QCOMPARE(QKeySequence::listFromString(strSequences), sequences);
+}
+
 #if !defined (Q_OS_MAC) && !defined (Q_OS_WINCE)
 void tst_QKeySequence::translated_data()
 {
diff --git a/tests/auto/gui/kernel/qsurfaceformat/qsurfaceformat.pro b/tests/auto/gui/kernel/qsurfaceformat/qsurfaceformat.pro
new file mode 100644
index 0000000000..dabffde77b
--- /dev/null
+++ b/tests/auto/gui/kernel/qsurfaceformat/qsurfaceformat.pro
@@ -0,0 +1,8 @@
+CONFIG += testcase
+CONFIG += parallel_test
+TARGET = tst_qsurfaceformat
+
+QT += core-private gui-private testlib
+
+SOURCES  += tst_qsurfaceformat.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/gui/kernel/qsurfaceformat/tst_qsurfaceformat.cpp b/tests/auto/gui/kernel/qsurfaceformat/tst_qsurfaceformat.cpp
new file mode 100644
index 0000000000..bd4fc88b3c
--- /dev/null
+++ b/tests/auto/gui/kernel/qsurfaceformat/tst_qsurfaceformat.cpp
@@ -0,0 +1,102 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qsurfaceformat.h>
+
+#include <QtTest/QtTest>
+
+class tst_QSurfaceFormat: public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void versionCheck_data();
+    void versionCheck();
+};
+
+void tst_QSurfaceFormat::versionCheck_data()
+{
+    QTest::addColumn<int>("formatMajor");
+    QTest::addColumn<int>("formatMinor");
+    QTest::addColumn<int>("compareMajor");
+    QTest::addColumn<int>("compareMinor");
+    QTest::addColumn<bool>("expected");
+
+    QTest::newRow("lower major, lower minor")
+        << 3 << 2 << 2 << 1 << true;
+    QTest::newRow("lower major, same minor")
+        << 3 << 2 << 2 << 2 << true;
+    QTest::newRow("lower major, greater minor")
+        << 3 << 2 << 2 << 3 << true;
+    QTest::newRow("same major, lower minor")
+        << 3 << 2 << 3 << 1 << true;
+    QTest::newRow("same major, same minor")
+        << 3 << 2 << 3 << 2 << true;
+    QTest::newRow("same major, greater minor")
+        << 3 << 2 << 3 << 3 << false;
+    QTest::newRow("greater major, lower minor")
+        << 3 << 2 << 4 << 1 << false;
+    QTest::newRow("greater major, same minor")
+        << 3 << 2 << 4 << 2 << false;
+    QTest::newRow("greater major, greater minor")
+        << 3 << 2 << 4 << 3 << false;
+}
+
+void tst_QSurfaceFormat::versionCheck()
+{
+    QFETCH( int, formatMajor );
+    QFETCH( int, formatMinor );
+    QFETCH( int, compareMajor );
+    QFETCH( int, compareMinor );
+    QFETCH( bool, expected );
+
+    QSurfaceFormat format;
+    format.setMinorVersion(formatMinor);
+    format.setMajorVersion(formatMajor);
+
+    QCOMPARE(format.version() >= qMakePair(compareMajor, compareMinor), expected);
+
+    format.setVersion(formatMajor, formatMinor);
+    QCOMPARE(format.version() >= qMakePair(compareMajor, compareMinor), expected);
+}
+
+#include <tst_qsurfaceformat.moc>
+QTEST_MAIN(tst_QSurfaceFormat);
diff --git a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
index 9aebe135ef..5934776c5b 100644
--- a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
+++ b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
@@ -414,7 +414,7 @@ void tst_QTouchEvent::touchBeginPropagatesWhenIgnored()
     // QGraphicsView
     {
         QGraphicsScene scene;
-        tst_QTouchEventGraphicsItem root, child, grandchild;        
+        tst_QTouchEventGraphicsItem root, child, grandchild;
         QGraphicsView view(&scene);
         scene.addItem(&root);
         root.setPos(100, 100);
@@ -778,7 +778,7 @@ void tst_QTouchEvent::multiPointRawEventTranslationOnTouchScreen()
     QVERIFY(rightWidget.seenTouchBegin);
     QVERIFY(!rightWidget.seenTouchUpdate);
     QVERIFY(!rightWidget.seenTouchEnd);
-    QCOMPARE(leftWidget.touchBeginPoints.count(), 1);    
+    QCOMPARE(leftWidget.touchBeginPoints.count(), 1);
     QCOMPARE(rightWidget.touchBeginPoints.count(), 1);
     {
         QTouchEvent::TouchPoint leftTouchPoint = leftWidget.touchBeginPoints.first();
@@ -1633,4 +1633,4 @@ void tst_QTouchEvent::testMultiDevice()
 
 QTEST_MAIN(tst_QTouchEvent)
 
-#include "tst_qtouchevent.moc"      
+#include "tst_qtouchevent.moc"
diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
index 30666aaf2a..b67920737e 100644
--- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
+++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
@@ -49,6 +49,7 @@
 
 // For QSignalSpy slot connections.
 Q_DECLARE_METATYPE(Qt::ScreenOrientation)
+Q_DECLARE_METATYPE(QWindow::Visibility)
 
 class tst_QWindow: public QObject
 {
@@ -75,6 +76,8 @@ private slots:
     void inputReentrancy();
     void tabletEvents();
     void windowModality_QTBUG27039();
+    void visibility();
+    void mask();
 
     void initTestCase()
     {
@@ -1079,6 +1082,60 @@ void tst_QWindow::windowModality_QTBUG27039()
     QCOMPARE(modalA.mousePressedCount, 1);
 }
 
+void tst_QWindow::visibility()
+{
+    qRegisterMetaType<Qt::WindowModality>("QWindow::Visibility");
+
+    QWindow window;
+    QSignalSpy spy(&window, SIGNAL(visibilityChanged(QWindow::Visibility)));
+
+    window.setVisibility(QWindow::AutomaticVisibility);
+    QVERIFY(window.isVisible());
+    QVERIFY(window.visibility() != QWindow::Hidden);
+    QVERIFY(window.visibility() != QWindow::AutomaticVisibility);
+    QCOMPARE(spy.count(), 1);
+    spy.clear();
+
+    window.setVisibility(QWindow::Hidden);
+    QVERIFY(!window.isVisible());
+    QCOMPARE(window.visibility(), QWindow::Hidden);
+    QCOMPARE(spy.count(), 1);
+    spy.clear();
+
+    window.setVisibility(QWindow::FullScreen);
+    QVERIFY(window.isVisible());
+    QCOMPARE(window.windowState(), Qt::WindowFullScreen);
+    QCOMPARE(window.visibility(), QWindow::FullScreen);
+    QCOMPARE(spy.count(), 1);
+    spy.clear();
+
+    window.setWindowState(Qt::WindowNoState);
+    QCOMPARE(window.visibility(), QWindow::Windowed);
+    QCOMPARE(spy.count(), 1);
+    spy.clear();
+
+    window.setVisible(false);
+    QCOMPARE(window.visibility(), QWindow::Hidden);
+    QCOMPARE(spy.count(), 1);
+    spy.clear();
+}
+
+void tst_QWindow::mask()
+{
+    QRegion mask = QRect(10, 10, 800 - 20, 600 - 20);
+
+    QWindow window;
+    window.resize(800, 600);
+    window.setMask(mask);
+
+    QCOMPARE(window.mask(), QRegion());
+
+    window.create();
+    window.setMask(mask);
+
+    QCOMPARE(window.mask(), mask);
+}
+
 #include <tst_qwindow.moc>
 QTEST_MAIN(tst_QWindow)
 
diff --git a/tests/auto/gui/math3d/qvectornd/tst_qvectornd.cpp b/tests/auto/gui/math3d/qvectornd/tst_qvectornd.cpp
index 5cd597aeb8..0041ad0015 100644
--- a/tests/auto/gui/math3d/qvectornd/tst_qvectornd.cpp
+++ b/tests/auto/gui/math3d/qvectornd/tst_qvectornd.cpp
@@ -128,10 +128,16 @@ private slots:
     void crossProduct();
     void normal_data();
     void normal();
+    void distanceToPoint2_data();
+    void distanceToPoint2();
+    void distanceToPoint3_data();
+    void distanceToPoint3();
     void distanceToPlane_data();
     void distanceToPlane();
-    void distanceToLine_data();
-    void distanceToLine();
+    void distanceToLine2_data();
+    void distanceToLine2();
+    void distanceToLine3_data();
+    void distanceToLine3();
 
     void dotProduct2_data();
     void dotProduct2();
@@ -1788,6 +1794,108 @@ void tst_QVectorND::normal()
     QVERIFY(QVector3D::normal(point, v1 + point, v2 + point) == v3.normalized());
 }
 
+// Test distance to point calculations.
+void tst_QVectorND::distanceToPoint2_data()
+{
+    QTest::addColumn<float>("x1");  // Point to test for distance
+    QTest::addColumn<float>("y1");
+    QTest::addColumn<float>("x2");  // Point to test against
+    QTest::addColumn<float>("y2");
+
+    QTest::addColumn<float>("distance");
+
+    QTest::newRow("null")
+        << 0.0f << 0.0f
+        << 0.0f << 1.0f
+        << 1.0f;
+
+    QTest::newRow("on point")
+        << 1.0f << 1.0f
+        << 1.0f << 1.0f
+        << 0.0f;
+
+    QTest::newRow("off point")
+        << 0.0f << 1.0f
+        << 0.0f << 2.0f
+        << 1.0f;
+
+    QTest::newRow("off point 2")
+        << 0.0f << 0.0f
+        << 0.0f << 2.0f
+        << 2.0f;
+
+    QTest::newRow("minus point")
+        << 0.0f << 0.0f
+        << 0.0f << -2.0f
+        << 2.0f;
+}
+void tst_QVectorND::distanceToPoint2()
+{
+    QFETCH(float, x1);
+    QFETCH(float, y1);
+    QFETCH(float, x2);
+    QFETCH(float, y2);
+    QFETCH(float, distance);
+
+    QVector2D v1(x1, y1);
+    QVector2D v2(x2, y2);
+
+    QCOMPARE(v1.distanceToPoint(v2), distance);
+}
+
+// Test distance to point calculations.
+void tst_QVectorND::distanceToPoint3_data()
+{
+    QTest::addColumn<float>("x1");  // Point to test for distance
+    QTest::addColumn<float>("y1");
+    QTest::addColumn<float>("z1");
+    QTest::addColumn<float>("x2");  // Point to test against
+    QTest::addColumn<float>("y2");
+    QTest::addColumn<float>("z2");
+
+    QTest::addColumn<float>("distance");
+
+    QTest::newRow("null")
+        << 0.0f << 0.0f << 0.0f
+        << 0.0f << 0.0f << 1.0f
+        << 1.0f;
+
+    QTest::newRow("on point")
+        << 0.0f << 0.0f << 0.0f
+        << 0.0f << 0.0f << 0.0f
+        << 0.0f;
+
+    QTest::newRow("off point")
+        << 0.0f << 0.0f << 1.0f
+        << 0.0f << 0.0f << 2.0f
+        << 1.0f;
+
+    QTest::newRow("off point 2")
+        << 0.0f << 0.0f << 0.0f
+        << 0.0f << 2.0f << 0.0f
+        << 2.0f;
+
+    QTest::newRow("minus point")
+        << 0.0f << 0.0f << 0.0f
+        << 0.0f << -2.0f << 0.0f
+        << 2.0f;
+}
+void tst_QVectorND::distanceToPoint3()
+{
+    QFETCH(float, x1);
+    QFETCH(float, y1);
+    QFETCH(float, z1);
+    QFETCH(float, x2);
+    QFETCH(float, y2);
+    QFETCH(float, z2);
+    QFETCH(float, distance);
+
+    QVector3D v1(x1, y1, z1);
+    QVector3D v2(x2, y2, z2);
+
+    QCOMPARE(v1.distanceToPoint(v2), distance);
+}
+
 // Test distance to plane calculations.
 void tst_QVectorND::distanceToPlane_data()
 {
@@ -1862,7 +1970,65 @@ void tst_QVectorND::distanceToPlane()
 }
 
 // Test distance to line calculations.
-void tst_QVectorND::distanceToLine_data()
+void tst_QVectorND::distanceToLine2_data()
+{
+    QTest::addColumn<float>("x1");  // Point on line
+    QTest::addColumn<float>("y1");
+    QTest::addColumn<float>("x2");  // Direction of the line
+    QTest::addColumn<float>("y2");
+    QTest::addColumn<float>("x3");  // Point to test for distance
+    QTest::addColumn<float>("y3");
+    QTest::addColumn<float>("distance");
+
+    QTest::newRow("null")
+        << 0.0f << 0.0f
+        << 0.0f << 0.1f
+        << 0.0f << 0.0f
+        << 0.0f;
+
+    QTest::newRow("on line")
+        << 0.0f << 0.0f
+        << 0.0f << 1.0f
+        << 0.0f << 5.0f
+        << 0.0f;
+
+    QTest::newRow("off line")
+        << 0.0f << 0.0f
+        << 0.0f << 1.0f
+        << 1.0f << 0.0f
+        << 1.0f;
+
+    QTest::newRow("off line 2")
+        << 0.0f << 0.0f
+        << 0.0f << 1.0f
+        << -2.0f << 0.0f
+        << 2.0f;
+
+    QTest::newRow("points")
+        << 0.0f << 0.0f
+        << 0.0f << 0.0f
+        << 0.0f << 5.0f
+        << 5.0f;
+}
+
+void tst_QVectorND::distanceToLine2()
+{
+    QFETCH(float, x1);
+    QFETCH(float, y1);
+    QFETCH(float, x2);
+    QFETCH(float, y2);
+    QFETCH(float, x3);
+    QFETCH(float, y3);
+    QFETCH(float, distance);
+
+    QVector2D v1(x1, y1);
+    QVector2D v2(x2, y2);
+    QVector2D v3(x3, y3);
+
+    QCOMPARE(v3.distanceToLine(v1, v2), distance);
+}
+// Test distance to line calculations.
+void tst_QVectorND::distanceToLine3_data()
 {
     QTest::addColumn<float>("x1");  // Point on line
     QTest::addColumn<float>("y1");
@@ -1905,7 +2071,7 @@ void tst_QVectorND::distanceToLine_data()
         << 0.0f << 5.0f << 0.0f
         << 5.0f;
 }
-void tst_QVectorND::distanceToLine()
+void tst_QVectorND::distanceToLine3()
 {
     QFETCH(float, x1);
     QFETCH(float, y1);
diff --git a/tests/auto/gui/painting/qpainter/qpainter.pro b/tests/auto/gui/painting/qpainter/qpainter.pro
index a30564cc50..752f9be1f4 100644
--- a/tests/auto/gui/painting/qpainter/qpainter.pro
+++ b/tests/auto/gui/painting/qpainter/qpainter.pro
@@ -4,7 +4,6 @@ TARGET = tst_qpainter
 
 QT += testlib
 qtHaveModule(widgets): QT += widgets widgets-private
-qtHaveModule(widgets):!wince*: QT += printsupport
 
 SOURCES  += tst_qpainter.cpp
 
diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
index 774ade5fb0..6c37f1fc27 100644
--- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
+++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
@@ -53,9 +53,6 @@
 #include <qthread.h>
 #include <limits.h>
 #if !defined(Q_OS_WINCE)
-#ifndef QT_NO_WIDGETS
-#include <qprinter.h>
-#endif
 #include <math.h>
 #endif
 #include <qpaintengine.h>
diff --git a/tests/auto/gui/painting/qpathclipper/paths.cpp b/tests/auto/gui/painting/qpathclipper/paths.cpp
index d7f0d6d59b..3bc2484578 100644
--- a/tests/auto/gui/painting/qpathclipper/paths.cpp
+++ b/tests/auto/gui/painting/qpathclipper/paths.cpp
@@ -127,7 +127,7 @@ QPainterPath Paths::body()
     path.cubicTo(105.28125,81.341000, 89.784000,65.812500, 70.531250,65.812500);
     path.lineTo(54.437500,65.812500);
     path.closeSubpath();
-        
+
     return path;
 }
 
@@ -143,7 +143,7 @@ QPainterPath Paths::mailbox()
     path.lineTo(443.62570,100.11509);
     path.lineTo(355.22951,136.82424);
     path.closeSubpath();
-    
+
     return path;
 }
 
@@ -271,7 +271,7 @@ QPainterPath Paths::lips()
     path.cubicTo(283.58862,123.78263, 270.15105,136.64382, 243.62716,155.61729);
     path.cubicTo(217.47805,174.32266, 199.38332,176.65905, 177.02257,176.65905);
     path.closeSubpath();
-        
+
     return path;
 }
 
@@ -290,14 +290,14 @@ QPainterPath Paths::bezier2()
     QPainterPath path;
     path.moveTo(200,200);
     path.cubicTo(200,125, 500,100, 500,500);
-    
+
     return path;
 }
 
 QPainterPath Paths::random1()
 {
     QPainterPath path;
-    
+
     path.moveTo(65.714286,91.428571);
     path.lineTo(217.14286, 102.85714);
     path.cubicTo(219.04762, 106.66666,
@@ -341,7 +341,7 @@ QPainterPath Paths::random1()
 QPainterPath Paths::random2()
 {
     QPainterPath path;
-    
+
     path.moveTo(314.28571,160);
     path.cubicTo(434.28571,125.71429,
                  505.71429,200,
@@ -573,7 +573,7 @@ QPainterPath Paths::triangle1()
 }
 
 QPainterPath Paths::triangle2()
-{  
+{
     QPainterPath path;
 
     path.moveTo(0, 120);
diff --git a/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp b/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp
index cd4f808c4e..4c73676329 100644
--- a/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp
+++ b/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp
@@ -154,7 +154,7 @@ void tst_QWMatrix::mapping_data()
 			       << QRect( 0, 0, 30, 40 )
 			       << QPolygon( QRect( -300, -400, 300, 400 ) );
 
-#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)
+#if (defined(Q_OS_WIN) || defined(Q_OS_WINCE)) && !defined(M_PI)
 #define M_PI 3.14159265897932384626433832795f
 #endif
 
diff --git a/tests/auto/gui/qopengl/tst_qopengl.cpp b/tests/auto/gui/qopengl/tst_qopengl.cpp
index 1d498773ae..97f3ec128d 100644
--- a/tests/auto/gui/qopengl/tst_qopengl.cpp
+++ b/tests/auto/gui/qopengl/tst_qopengl.cpp
@@ -47,6 +47,7 @@
 #include <QtGui/QPainter>
 #include <QtGui/QScreen>
 #include <QtGui/QWindow>
+#include <QtGui/QOffscreenSurface>
 
 #include <QtTest/QtTest>
 
@@ -57,12 +58,18 @@ class tst_QOpenGL : public QObject
 Q_OBJECT
 
 private slots:
+    void sharedResourceCleanup_data();
     void sharedResourceCleanup();
+    void multiGroupSharedResourceCleanup_data();
     void multiGroupSharedResourceCleanup();
+    void multiGroupSharedResourceCleanupCustom_data();
     void multiGroupSharedResourceCleanupCustom();
+    void fboSimpleRendering_data();
     void fboSimpleRendering();
+    void fboRendering_data();
     void fboRendering();
     void fboHandleNulledAfterContextDestroyed();
+    void openGLPaintDevice_data();
     void openGLPaintDevice();
     void aboutToBeDestroyed();
     void QTBUG15621_triangulatingStrokerDivZero();
@@ -129,16 +136,43 @@ struct SharedResource : public QOpenGLSharedResource
     SharedResourceTracker *tracker;
 };
 
+static QSurface *createSurface(int surfaceClass)
+{
+    if (surfaceClass == int(QSurface::Window)) {
+        QWindow *window = new QWindow;
+        window->setSurfaceType(QWindow::OpenGLSurface);
+        window->setGeometry(0, 0, 10, 10);
+        window->create();
+        return window;
+    } else if (surfaceClass == int(QSurface::Offscreen)) {
+        QOffscreenSurface *offscreenSurface = new QOffscreenSurface;
+        offscreenSurface->create();
+        return offscreenSurface;
+    }
+    return 0;
+}
+
+static void common_data()
+{
+    QTest::addColumn<int>("surfaceClass");
+
+    QTest::newRow("Using QWindow") << int(QSurface::Window);
+    QTest::newRow("Using QOffscreenSurface") << int(QSurface::Offscreen);
+}
+
+void tst_QOpenGL::sharedResourceCleanup_data()
+{
+    common_data();
+}
+
 void tst_QOpenGL::sharedResourceCleanup()
 {
-    QWindow window;
-    window.setSurfaceType(QWindow::OpenGLSurface);
-    window.setGeometry(0, 0, 10, 10);
-    window.create();
+    QFETCH(int, surfaceClass);
+    QScopedPointer<QSurface> surface(createSurface(surfaceClass));
 
     QOpenGLContext *ctx = new QOpenGLContext;
     ctx->create();
-    ctx->makeCurrent(&window);
+    ctx->makeCurrent(surface.data());
 
     SharedResourceTracker tracker;
     SharedResource *resource = new SharedResource(&tracker);
@@ -165,7 +199,7 @@ void tst_QOpenGL::sharedResourceCleanup()
     QCOMPARE(tracker.freeResourceCalls, 0);
     QCOMPARE(tracker.destructorCalls, 0);
 
-    ctx2->makeCurrent(&window);
+    ctx2->makeCurrent(surface.data());
 
     // freeResource() should now have been called
     QCOMPARE(tracker.invalidateResourceCalls, 0);
@@ -192,17 +226,20 @@ void tst_QOpenGL::sharedResourceCleanup()
     QCOMPARE(tracker.destructorCalls, 1);
 }
 
+void tst_QOpenGL::multiGroupSharedResourceCleanup_data()
+{
+    common_data();
+}
+
 void tst_QOpenGL::multiGroupSharedResourceCleanup()
 {
-    QWindow window;
-    window.setSurfaceType(QWindow::OpenGLSurface);
-    window.setGeometry(0, 0, 10, 10);
-    window.create();
+    QFETCH(int, surfaceClass);
+    QScopedPointer<QSurface> surface(createSurface(surfaceClass));
 
     for (int i = 0; i < 10; ++i) {
         QOpenGLContext *gl = new QOpenGLContext();
         gl->create();
-        gl->makeCurrent(&window);
+        gl->makeCurrent(surface.data());
         {
             // Cause QOpenGLMultiGroupSharedResource instantiation.
             QOpenGLFunctions func(gl);
@@ -214,16 +251,19 @@ void tst_QOpenGL::multiGroupSharedResourceCleanup()
     // Shouldn't crash when application exits.
 }
 
+void tst_QOpenGL::multiGroupSharedResourceCleanupCustom_data()
+{
+    common_data();
+}
+
 void tst_QOpenGL::multiGroupSharedResourceCleanupCustom()
 {
-    QWindow window;
-    window.setSurfaceType(QWindow::OpenGLSurface);
-    window.setGeometry(0, 0, 10, 10);
-    window.create();
+    QFETCH(int, surfaceClass);
+    QScopedPointer<QSurface> surface(createSurface(surfaceClass));
 
     QOpenGLContext *ctx = new QOpenGLContext();
     ctx->create();
-    ctx->makeCurrent(&window);
+    ctx->makeCurrent(surface.data());
 
     QOpenGLMultiGroupSharedResource multiGroupSharedResource;
     SharedResource *resource = multiGroupSharedResource.value<SharedResource>(ctx);
@@ -350,17 +390,20 @@ void qt_opengl_check_test_pattern(const QImage& img)
     QFUZZY_COMPARE_PIXELS(img.pixel(192, 64), QColor(Qt::green).rgb());
 }
 
+void tst_QOpenGL::fboSimpleRendering_data()
+{
+    common_data();
+}
 
 void tst_QOpenGL::fboSimpleRendering()
 {
-    QWindow window;
-    window.setSurfaceType(QWindow::OpenGLSurface);
-    window.setGeometry(0, 0, 10, 10);
-    window.create();
+    QFETCH(int, surfaceClass);
+    QScopedPointer<QSurface> surface(createSurface(surfaceClass));
+
     QOpenGLContext ctx;
     ctx.create();
 
-    ctx.makeCurrent(&window);
+    ctx.makeCurrent(surface.data());
 
     if (!QOpenGLFramebufferObject::hasOpenGLFramebufferObjects())
         QSKIP("QOpenGLFramebufferObject not supported on this platform");
@@ -386,6 +429,11 @@ void tst_QOpenGL::fboSimpleRendering()
     delete fbo;
 }
 
+void tst_QOpenGL::fboRendering_data()
+{
+    common_data();
+}
+
 // NOTE: This tests that CombinedDepthStencil attachment works by assuming the
 //       GL2 engine is being used and is implemented the same way as it was when
 //       this autotest was written. If this is not the case, there may be some
@@ -397,14 +445,13 @@ void tst_QOpenGL::fboRendering()
     QSKIP("QTBUG-22617");
 #endif
 
-    QWindow window;
-    window.setSurfaceType(QWindow::OpenGLSurface);
-    window.setGeometry(0, 0, 10, 10);
-    window.create();
+    QFETCH(int, surfaceClass);
+    QScopedPointer<QSurface> surface(createSurface(surfaceClass));
+
     QOpenGLContext ctx;
     ctx.create();
 
-    ctx.makeCurrent(&window);
+    ctx.makeCurrent(surface.data());
 
     if (!QOpenGLFramebufferObject::hasOpenGLFramebufferObjects())
         QSKIP("QOpenGLFramebufferObject not supported on this platform");
@@ -461,16 +508,19 @@ void tst_QOpenGL::fboHandleNulledAfterContextDestroyed()
     QCOMPARE(fbo->handle(), 0U);
 }
 
+void tst_QOpenGL::openGLPaintDevice_data()
+{
+    common_data();
+}
+
 void tst_QOpenGL::openGLPaintDevice()
 {
 #if defined(Q_OS_LINUX) && defined(Q_CC_GNU) && !defined(__x86_64__)
     QSKIP("QTBUG-22617");
 #endif
 
-    QWindow window;
-    window.setSurfaceType(QWindow::OpenGLSurface);
-    window.setGeometry(0, 0, 128, 128);
-    window.create();
+    QFETCH(int, surfaceClass);
+    QScopedPointer<QSurface> surface(createSurface(surfaceClass));
 
     QOpenGLContext ctx;
     ctx.create();
@@ -478,7 +528,7 @@ void tst_QOpenGL::openGLPaintDevice()
     QSurfaceFormat format = ctx.format();
     if (format.majorVersion() < 2)
         QSKIP("This test requires at least OpenGL 2.0");
-    ctx.makeCurrent(&window);
+    ctx.makeCurrent(surface.data());
 
     QImage image(128, 128, QImage::Format_RGB32);
     QPainter p(&image);
diff --git a/tests/auto/gui/text/qfontcache/.gitignore b/tests/auto/gui/text/qfontcache/.gitignore
new file mode 100644
index 0000000000..e963ab010a
--- /dev/null
+++ b/tests/auto/gui/text/qfontcache/.gitignore
@@ -0,0 +1 @@
+tst_qfontcache
diff --git a/tests/auto/gui/text/qfontcache/qfontcache.pro b/tests/auto/gui/text/qfontcache/qfontcache.pro
new file mode 100644
index 0000000000..313cd78714
--- /dev/null
+++ b/tests/auto/gui/text/qfontcache/qfontcache.pro
@@ -0,0 +1,8 @@
+CONFIG += testcase
+CONFIG += parallel_test
+TARGET = tst_qfontcache
+QT += testlib
+QT += core-private gui-private
+SOURCES  += tst_qfontcache.cpp
+
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/gui/text/qfontcache/tst_qfontcache.cpp b/tests/auto/gui/text/qfontcache/tst_qfontcache.cpp
new file mode 100644
index 0000000000..a85fadfce7
--- /dev/null
+++ b/tests/auto/gui/text/qfontcache/tst_qfontcache.cpp
@@ -0,0 +1,148 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include <QtTest/QtTest>
+
+
+#include <qfont.h>
+#include <private/qfont_p.h>
+#include <private/qfontengine_p.h>
+
+class tst_QFontCache : public QObject
+{
+Q_OBJECT
+
+public:
+    tst_QFontCache();
+    virtual ~tst_QFontCache();
+
+private slots:
+    void clear();
+};
+
+QT_BEGIN_NAMESPACE
+extern void qt_setQtEnableTestFont(bool value); // qfontdatabase.cpp
+
+#ifdef QT_BUILD_INTERNAL
+// qfontengine.cpp
+extern void QFontEngine_startCollectingEngines();
+extern QList<QFontEngine *> QFontEngine_stopCollectingEngines();
+#endif
+QT_END_NAMESPACE
+
+tst_QFontCache::tst_QFontCache()
+{
+}
+
+tst_QFontCache::~tst_QFontCache()
+{
+}
+
+void tst_QFontCache::clear()
+{
+#ifdef QT_BUILD_INTERNAL
+    QFontEngine_startCollectingEngines();
+#else
+    // must not crash, at very least ;)
+#endif
+
+    QFontEngine *fontEngine = 0;
+
+    {
+        // we're never caching the box (and the "test") font engines
+        // let's ensure we're not leaking them as well as the cached ones
+        qt_setQtEnableTestFont(true);
+
+        QFont f;
+        f.setFamily("__Qt__Box__Engine__");
+        f.exactMatch(); // loads engine
+    }
+    {
+        QFontDatabase db;
+
+        QFont f;
+        f.setStyleHint(QFont::Serif);
+        const QString familyForHint(f.defaultFamily());
+
+        // it should at least return a family that is available
+        QVERIFY(db.hasFamily(familyForHint));
+        f.exactMatch(); // loads engine
+
+        fontEngine = QFontPrivate::get(f)->engineForScript(QChar::Script_Common);
+        QVERIFY(fontEngine);
+        QVERIFY(QFontCache::instance()->engineCacheCount.value(fontEngine) > 0); // ensure it is cached
+
+        // acquire the engine to use it somewhere else:
+        // (e.g. like the we do in QFontSubset() or like QRawFont does in fromFont())
+        fontEngine->ref.ref();
+
+        // cache the engine once again; there is a special case when the engine is cached more than once
+        QFontCache::instance()->insertEngine(QFontCache::Key(QFontDef(), 0, 0), fontEngine);
+    }
+
+    // use it:
+    // e.g. fontEngine->stringToCMap(..);
+
+    // and whilst it is alive, don't hesitate to add/remove the app-local fonts:
+    // (QFontDatabase::{add,remove}ApplicationFont() clears the cache)
+    QFontCache::instance()->clear();
+
+    // release the acquired engine:
+    if (fontEngine) {
+        if (!fontEngine->ref.deref())
+            delete fontEngine;
+        fontEngine = 0;
+    }
+
+    // we may even exit the application now:
+    QFontCache::instance()->cleanup();
+
+#ifdef QT_BUILD_INTERNAL
+    QList<QFontEngine *> leakedEngines = QFontEngine_stopCollectingEngines();
+for (int i = 0; i < leakedEngines.size(); ++i) qWarning() << i << leakedEngines.at(i) << leakedEngines.at(i)->ref.load();
+    // and we are not leaking!
+    QCOMPARE(leakedEngines.size(), 0);
+#endif
+}
+
+QTEST_MAIN(tst_QFontCache)
+#include "tst_qfontcache.moc"
diff --git a/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp b/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp
index 15e8c2ee90..cddec5b6e7 100644
--- a/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp
+++ b/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp
@@ -281,7 +281,7 @@ void tst_QFontMetrics::inFontUcs4()
     }
 
     {
-        QFontEngine *engine = QFontPrivate::get(font)->engineForScript(QUnicodeTables::Common);
+        QFontEngine *engine = QFontPrivate::get(font)->engineForScript(QChar::Script_Common);
         QGlyphLayout glyphs;
         glyphs.numGlyphs = 3;
         uint buf[3];
diff --git a/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp b/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp
index f62e5f188b..46f97840af 100644
--- a/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp
+++ b/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp
@@ -224,7 +224,7 @@ void tst_QStaticText::drawToRect()
 #endif
 
     QVERIFY(imageDrawText.toImage() != m_whiteSquare);
-    QCOMPARE(imageDrawStaticText, imageDrawText);   
+    QCOMPARE(imageDrawStaticText, imageDrawText);
 }
 
 void tst_QStaticText::prepareToCorrectData()
diff --git a/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp b/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp
index fa2a2985f0..5484c9ed93 100644
--- a/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp
+++ b/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp
@@ -527,26 +527,26 @@ void tst_QSyntaxHighlighter::rehighlight()
 void tst_QSyntaxHighlighter::rehighlightBlock()
 {
     TestHighlighter *hl = new TestHighlighter(doc);
-    
+
     cursor.movePosition(QTextCursor::Start);
     cursor.beginEditBlock();
     cursor.insertText("Hello");
     cursor.insertBlock();
     cursor.insertText("World");
     cursor.endEditBlock();
-    
+
     hl->callCount = 0;
     hl->highlightedText.clear();
     QTextBlock block = doc->begin();
     hl->rehighlightBlock(block);
-    
+
     QCOMPARE(hl->highlightedText, QString("Hello"));
     QCOMPARE(hl->callCount, 1);
-    
+
     hl->callCount = 0;
     hl->highlightedText.clear();
     hl->rehighlightBlock(block.next());
-    
+
     QCOMPARE(hl->highlightedText, QString("World"));
     QCOMPARE(hl->callCount, 1);
 }
diff --git a/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp b/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp
index f7b4456c43..1eb073d3b4 100644
--- a/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp
+++ b/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp
@@ -72,7 +72,7 @@ private slots:
 
 /*! \internal
   This (used to) trigger a crash in:
- 
+
     QDataStream &operator>>(QDataStream &stream, QTextFormat &fmt)
 
   which is most easily produced through QSettings.
diff --git a/tests/auto/gui/text/qtextlayout/qtextlayout.pro b/tests/auto/gui/text/qtextlayout/qtextlayout.pro
index 9833a5bd1a..9a2388d878 100644
--- a/tests/auto/gui/text/qtextlayout/qtextlayout.pro
+++ b/tests/auto/gui/text/qtextlayout/qtextlayout.pro
@@ -3,5 +3,4 @@ TARGET = tst_qtextlayout
 QT += core-private gui-private testlib
 HEADERS += 
 SOURCES += tst_qtextlayout.cpp 
-DEFINES += QT_COMPILES_IN_HARFBUZZ
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/gui/text/qtextscriptengine/generate/generate.pro b/tests/auto/gui/text/qtextscriptengine/generate/generate.pro
index bd85c108c2..908c309447 100644
--- a/tests/auto/gui/text/qtextscriptengine/generate/generate.pro
+++ b/tests/auto/gui/text/qtextscriptengine/generate/generate.pro
@@ -1,5 +1,5 @@
 CONFIG -= moc
-QT += core-private   # for harfbuzz
+QT += core-private
 INCLUDEPATH += . /usr/include/freetype2
 
 SOURCES += main.cpp
diff --git a/tests/auto/gui/text/qtextscriptengine/generate/main.cpp b/tests/auto/gui/text/qtextscriptengine/generate/main.cpp
index 1dcdc28d81..f3fa42ec2e 100644
--- a/tests/auto/gui/text/qtextscriptengine/generate/main.cpp
+++ b/tests/auto/gui/text/qtextscriptengine/generate/main.cpp
@@ -81,7 +81,7 @@ void MyEdit::setText(const QString &str)
     result = "Using font '" + e->fontEngine(e->layoutData->items[0])->fontDef.family + "'\n\n";
 
     result += "{ { ";
-    for (int i = 0; i < str.length(); ++i) 
+    for (int i = 0; i < str.length(); ++i)
         result += "0x" + QString::number(str.at(i).unicode(), 16) + ", ";
     result += "0x0 },\n  { ";
     for (int i = 0; i < e->layoutData->items[0].num_glyphs; ++i)
diff --git a/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
index a6da20cc2b..eebac28323 100644
--- a/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
+++ b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
@@ -48,7 +48,7 @@
 
 class tst_QTextScriptEngine : public QObject
 {
-Q_OBJECT
+    Q_OBJECT
 
 public:
     tst_QTextScriptEngine();
@@ -210,93 +210,93 @@ void tst_QTextScriptEngine::devanagari_data()
     {
         if (QFontDatabase().families(QFontDatabase::Devanagari).contains("Raghindi")) {
             QFont f("Raghindi");
-	    const ShapeTable shape_table [] = {
-		// Ka
-		{ { 0x0915, 0x0 },
-		  { 0x0080, 0x0 } },
-		// Ka Halant
-		{ { 0x0915, 0x094d, 0x0 },
-		  { 0x0080, 0x0051, 0x0 } },
-		// Ka Halant Ka
-		{ { 0x0915, 0x094d, 0x0915, 0x0 },
-		  { 0x00c8, 0x0080, 0x0 } },
-		// Ka MatraI
-		{ { 0x0915, 0x093f, 0x0 },
-		  { 0x01d1, 0x0080, 0x0 } },
-		// Ra Halant Ka
-		{ { 0x0930, 0x094d, 0x0915, 0x0 },
-		  { 0x0080, 0x005b, 0x0 } },
-		// Ra Halant Ka MatraI
-		{ { 0x0930, 0x094d, 0x0915, 0x093f, 0x0 },
-		  { 0x01d1, 0x0080, 0x005b, 0x0 } },
-		// MatraI
-		{ { 0x093f, 0x0 },
-		  { 0x01d4, 0x029c, 0x0 } },
-		// Ka Nukta
-		{ { 0x0915, 0x093c, 0x0 },
-		  { 0x00a4, 0x0 } },
-		// Ka Halant Ra
-		{ { 0x0915, 0x094d, 0x0930, 0x0 },
-		  { 0x0110, 0x0 } },
-		// Ka Halant Ra Halant Ka
-		{ { 0x0915, 0x094d, 0x0930, 0x094d, 0x0915, 0x0 },
-		  { 0x0158, 0x0080, 0x0 } },
-		{ { 0x0930, 0x094d, 0x200d, 0x0 },
-		  { 0x00e2, 0x0 } },
-		{ { 0x0915, 0x094d, 0x0930, 0x094d, 0x200d, 0x0 },
-		  { 0x0158, 0x0 } },
-
-		{ {0}, {0} }
-	    };
-        prepareShapingTest(f, shape_table);
-	} else
-	    QSKIP("couldn't find Raghindi");
+            const ShapeTable shape_table [] = {
+                // Ka
+                { { 0x0915, 0x0 },
+                  { 0x0080, 0x0 } },
+                // Ka Halant
+                { { 0x0915, 0x094d, 0x0 },
+                  { 0x0080, 0x0051, 0x0 } },
+                // Ka Halant Ka
+                { { 0x0915, 0x094d, 0x0915, 0x0 },
+                  { 0x00c8, 0x0080, 0x0 } },
+                // Ka MatraI
+                { { 0x0915, 0x093f, 0x0 },
+                  { 0x01d1, 0x0080, 0x0 } },
+                // Ra Halant Ka
+                { { 0x0930, 0x094d, 0x0915, 0x0 },
+                  { 0x0080, 0x005b, 0x0 } },
+                // Ra Halant Ka MatraI
+                { { 0x0930, 0x094d, 0x0915, 0x093f, 0x0 },
+                  { 0x01d1, 0x0080, 0x005b, 0x0 } },
+                // MatraI
+                { { 0x093f, 0x0 },
+                  { 0x01d4, 0x029c, 0x0 } },
+                // Ka Nukta
+                { { 0x0915, 0x093c, 0x0 },
+                  { 0x00a4, 0x0 } },
+                // Ka Halant Ra
+                { { 0x0915, 0x094d, 0x0930, 0x0 },
+                  { 0x0110, 0x0 } },
+                // Ka Halant Ra Halant Ka
+                { { 0x0915, 0x094d, 0x0930, 0x094d, 0x0915, 0x0 },
+                  { 0x0158, 0x0080, 0x0 } },
+                { { 0x0930, 0x094d, 0x200d, 0x0 },
+                  { 0x00e2, 0x0 } },
+                { { 0x0915, 0x094d, 0x0930, 0x094d, 0x200d, 0x0 },
+                  { 0x0158, 0x0 } },
+
+                { {0}, {0} }
+            };
+            prepareShapingTest(f, shape_table);
+        } else
+            QSKIP("couldn't find Raghindi");
     }
 
     {
         if (QFontDatabase().families(QFontDatabase::Devanagari).contains("Mangal")) {
             QFont f("Mangal");
-	    const ShapeTable shape_table [] = {
-		// Ka
-		{ { 0x0915, 0x0 },
-		  { 0x0080, 0x0 } },
-		// Ka Halant
-		{ { 0x0915, 0x094d, 0x0 },
-		  { 0x0080, 0x0051, 0x0 } },
-		// Ka Halant Ka
-		{ { 0x0915, 0x094d, 0x0915, 0x0 },
-		  { 0x00c8, 0x0080, 0x0 } },
-		// Ka MatraI
-		{ { 0x0915, 0x093f, 0x0 },
-		  { 0x01d1, 0x0080, 0x0 } },
-		// Ra Halant Ka
-		{ { 0x0930, 0x094d, 0x0915, 0x0 },
-		  { 0x0080, 0x005b, 0x0 } },
-		// Ra Halant Ka MatraI
-		{ { 0x0930, 0x094d, 0x0915, 0x093f, 0x0 },
-		  { 0x01d1, 0x0080, 0x005b, 0x0 } },
-		// MatraI
-		{ { 0x093f, 0x0 },
-		  { 0x01d4, 0x029c, 0x0 } },
-		// Ka Nukta
-		{ { 0x0915, 0x093c, 0x0 },
-		  { 0x00a4, 0x0 } },
-		// Ka Halant Ra
-		{ { 0x0915, 0x094d, 0x0930, 0x0 },
-		  { 0x0110, 0x0 } },
-		// Ka Halant Ra Halant Ka
-		{ { 0x0915, 0x094d, 0x0930, 0x094d, 0x0915, 0x0 },
-		  { 0x0158, 0x0080, 0x0 } },
+            const ShapeTable shape_table [] = {
+                // Ka
+                { { 0x0915, 0x0 },
+                  { 0x0080, 0x0 } },
+                // Ka Halant
+                { { 0x0915, 0x094d, 0x0 },
+                  { 0x0080, 0x0051, 0x0 } },
+                // Ka Halant Ka
+                { { 0x0915, 0x094d, 0x0915, 0x0 },
+                  { 0x00c8, 0x0080, 0x0 } },
+                // Ka MatraI
+                { { 0x0915, 0x093f, 0x0 },
+                  { 0x01d1, 0x0080, 0x0 } },
+                // Ra Halant Ka
+                { { 0x0930, 0x094d, 0x0915, 0x0 },
+                  { 0x0080, 0x005b, 0x0 } },
+                // Ra Halant Ka MatraI
+                { { 0x0930, 0x094d, 0x0915, 0x093f, 0x0 },
+                  { 0x01d1, 0x0080, 0x005b, 0x0 } },
+                // MatraI
+                { { 0x093f, 0x0 },
+                  { 0x01d4, 0x029c, 0x0 } },
+                // Ka Nukta
+                { { 0x0915, 0x093c, 0x0 },
+                  { 0x00a4, 0x0 } },
+                // Ka Halant Ra
+                { { 0x0915, 0x094d, 0x0930, 0x0 },
+                  { 0x0110, 0x0 } },
+                // Ka Halant Ra Halant Ka
+                { { 0x0915, 0x094d, 0x0930, 0x094d, 0x0915, 0x0 },
+                  { 0x0158, 0x0080, 0x0 } },
 
                 { { 0x92b, 0x94d, 0x930, 0x0 },
                   { 0x125, 0x0 } },
                 { { 0x92b, 0x93c, 0x94d, 0x930, 0x0 },
-                  { 0x149, 0x0 } }, 
-		{ {0}, {0} }
-	    };
-        prepareShapingTest(f, shape_table);
-	} else
-	    QSKIP("couldn't find mangal");
+                  { 0x149, 0x0 } },
+                { {0}, {0} }
+            };
+            prepareShapingTest(f, shape_table);
+        } else
+            QSKIP("couldn't find mangal");
     }
 }
 
@@ -317,224 +317,224 @@ void tst_QTextScriptEngine::bengali_data()
     {
         if (QFontDatabase().families(QFontDatabase::Bengali).contains("Akaash")) {
             QFont f("Akaash");
-	    const ShapeTable shape_table [] = {
-		// Ka
-		{ { 0x0995, 0x0 },
-		  { 0x0151, 0x0 } },
-		// Ka Halant
-		{ { 0x0995, 0x09cd, 0x0 },
-		  { 0x0151, 0x017d, 0x0 } },
-		// Ka Halant Ka
-		{ { 0x0995, 0x09cd, 0x0995, 0x0 },
-		  { 0x019b, 0x0 } },
-		// Ka MatraI
-		{ { 0x0995, 0x09bf, 0x0 },
-		  { 0x0173, 0x0151, 0x0 } },
-		// Ra Halant Ka
-		{ { 0x09b0, 0x09cd, 0x0995, 0x0 },
-		  { 0x0151, 0x0276, 0x0 } },
-		// Ra Halant Ka MatraI
-		{ { 0x09b0, 0x09cd, 0x0995, 0x09bf, 0x0 },
-		  { 0x0173, 0x0151, 0x0276, 0x0 } },
-		// Ka Nukta
-		{ { 0x0995, 0x09bc, 0x0 },
-		  { 0x0151, 0x0171, 0x0 } },
-		// Ka Halant Ra
-		{ { 0x0995, 0x09cd, 0x09b0, 0x0 },
-		  { 0x01f4, 0x0 } },
-		// Ka Halant Ra Halant Ka
-		{ { 0x0995, 0x09cd, 0x09b0, 0x09cd, 0x0995, 0x0 },
-		  { 0x025c, 0x0276, 0x0151, 0x0 } },
-		// Ya + Halant
-		{ { 0x09af, 0x09cd, 0x0 },
-		  { 0x016a, 0x017d, 0x0 } },
-		// Da Halant Ya -> Da Ya-Phala
-		{ { 0x09a6, 0x09cd, 0x09af, 0x0 },
-		  { 0x01e5, 0x0 } },
-		// A Halant Ya -> A Ya-phala
-		{ { 0x0985, 0x09cd, 0x09af, 0x0 },
-		  { 0x0145, 0x01cf, 0x0 } },
-		// Na Halant Ka
-		{ { 0x09a8, 0x09cd, 0x0995, 0x0 },
-		  { 0x026f, 0x0151, 0x0 } },
-		// Na Halant ZWNJ Ka
-		{ { 0x09a8, 0x09cd, 0x200c, 0x0995, 0x0 },
-		  { 0x0164, 0x017d, 0x0151, 0x0 } },
-		// Na Halant ZWJ Ka
-		{ { 0x09a8, 0x09cd, 0x200d, 0x0995, 0x0 },
-		  { 0x026f, 0x0151, 0x0 } },
-		// Ka Halant ZWNJ Ka
-		{ { 0x0995, 0x09cd, 0x200c, 0x0995, 0x0 },
-		  { 0x0151, 0x017d, 0x0151, 0x0 } },
-		// Ka Halant ZWJ Ka
-		{ { 0x0995, 0x09cd, 0x200d, 0x0995, 0x0 },
-		  { 0x025c, 0x0151, 0x0 } },
-		// Na Halant Ra
-		{ { 0x09a8, 0x09cd, 0x09b0, 0x0 },
-		  { 0x0207, 0x0 } },
-		// Na Halant ZWNJ Ra
-		{ { 0x09a8, 0x09cd, 0x200c, 0x09b0, 0x0 },
-		  { 0x0164, 0x017d, 0x016b, 0x0 } },
-		// Na Halant ZWJ Ra
-		{ { 0x09a8, 0x09cd, 0x200d, 0x09b0, 0x0 },
-		  { 0x026f, 0x016b, 0x0 } },
-		// Na Halant Ba
-		{ { 0x09a8, 0x09cd, 0x09ac, 0x0 },
-		  { 0x022f, 0x0 } },
-		// Na Halant ZWNJ Ba
-		{ { 0x09a8, 0x09cd, 0x200c, 0x09ac, 0x0 },
-		  { 0x0164, 0x017d, 0x0167, 0x0 } },
-		// Na Halant ZWJ Ba
-		{ { 0x09a8, 0x09cd, 0x200d, 0x09ac, 0x0 },
-		  { 0x026f, 0x0167, 0x0 } },
-		// Na Halant Dha
-		{ { 0x09a8, 0x09cd, 0x09a7, 0x0 },
-		  { 0x01d3, 0x0 } },
-		// Na Halant ZWNJ Dha
-		{ { 0x09a8, 0x09cd, 0x200c, 0x09a7, 0x0 },
-		  { 0x0164, 0x017d, 0x0163, 0x0 } },
-		// Na Halant ZWJ Dha
-		{ { 0x09a8, 0x09cd, 0x200d, 0x09a7, 0x0 },
-		  { 0x026f, 0x0163, 0x0 } },
-		// Ra Halant Ka MatraAU
-		{ { 0x09b0, 0x09cd, 0x0995, 0x09cc, 0x0 },
-		  { 0x0179, 0x0151, 0x0276, 0x017e, 0x0 } },
-		// Ra Halant Ba Halant Ba
-		{ { 0x09b0, 0x09cd, 0x09ac, 0x09cd, 0x09ac, 0x0 },
-		  { 0x0232, 0x0276, 0x0 } },
+            const ShapeTable shape_table [] = {
+                // Ka
+                { { 0x0995, 0x0 },
+                  { 0x0151, 0x0 } },
+                // Ka Halant
+                { { 0x0995, 0x09cd, 0x0 },
+                  { 0x0151, 0x017d, 0x0 } },
+                // Ka Halant Ka
+                { { 0x0995, 0x09cd, 0x0995, 0x0 },
+                  { 0x019b, 0x0 } },
+                // Ka MatraI
+                { { 0x0995, 0x09bf, 0x0 },
+                  { 0x0173, 0x0151, 0x0 } },
+                // Ra Halant Ka
+                { { 0x09b0, 0x09cd, 0x0995, 0x0 },
+                  { 0x0151, 0x0276, 0x0 } },
+                // Ra Halant Ka MatraI
+                { { 0x09b0, 0x09cd, 0x0995, 0x09bf, 0x0 },
+                  { 0x0173, 0x0151, 0x0276, 0x0 } },
+                // Ka Nukta
+                { { 0x0995, 0x09bc, 0x0 },
+                  { 0x0151, 0x0171, 0x0 } },
+                // Ka Halant Ra
+                { { 0x0995, 0x09cd, 0x09b0, 0x0 },
+                  { 0x01f4, 0x0 } },
+                // Ka Halant Ra Halant Ka
+                { { 0x0995, 0x09cd, 0x09b0, 0x09cd, 0x0995, 0x0 },
+                  { 0x025c, 0x0276, 0x0151, 0x0 } },
+                // Ya + Halant
+                { { 0x09af, 0x09cd, 0x0 },
+                  { 0x016a, 0x017d, 0x0 } },
+                // Da Halant Ya -> Da Ya-Phala
+                { { 0x09a6, 0x09cd, 0x09af, 0x0 },
+                  { 0x01e5, 0x0 } },
+                // A Halant Ya -> A Ya-phala
+                { { 0x0985, 0x09cd, 0x09af, 0x0 },
+                  { 0x0145, 0x01cf, 0x0 } },
+                // Na Halant Ka
+                { { 0x09a8, 0x09cd, 0x0995, 0x0 },
+                  { 0x026f, 0x0151, 0x0 } },
+                // Na Halant ZWNJ Ka
+                { { 0x09a8, 0x09cd, 0x200c, 0x0995, 0x0 },
+                  { 0x0164, 0x017d, 0x0151, 0x0 } },
+                // Na Halant ZWJ Ka
+                { { 0x09a8, 0x09cd, 0x200d, 0x0995, 0x0 },
+                  { 0x026f, 0x0151, 0x0 } },
+                // Ka Halant ZWNJ Ka
+                { { 0x0995, 0x09cd, 0x200c, 0x0995, 0x0 },
+                  { 0x0151, 0x017d, 0x0151, 0x0 } },
+                // Ka Halant ZWJ Ka
+                { { 0x0995, 0x09cd, 0x200d, 0x0995, 0x0 },
+                  { 0x025c, 0x0151, 0x0 } },
+                // Na Halant Ra
+                { { 0x09a8, 0x09cd, 0x09b0, 0x0 },
+                  { 0x0207, 0x0 } },
+                // Na Halant ZWNJ Ra
+                { { 0x09a8, 0x09cd, 0x200c, 0x09b0, 0x0 },
+                  { 0x0164, 0x017d, 0x016b, 0x0 } },
+                // Na Halant ZWJ Ra
+                { { 0x09a8, 0x09cd, 0x200d, 0x09b0, 0x0 },
+                  { 0x026f, 0x016b, 0x0 } },
+                // Na Halant Ba
+                { { 0x09a8, 0x09cd, 0x09ac, 0x0 },
+                  { 0x022f, 0x0 } },
+                // Na Halant ZWNJ Ba
+                { { 0x09a8, 0x09cd, 0x200c, 0x09ac, 0x0 },
+                  { 0x0164, 0x017d, 0x0167, 0x0 } },
+                // Na Halant ZWJ Ba
+                { { 0x09a8, 0x09cd, 0x200d, 0x09ac, 0x0 },
+                  { 0x026f, 0x0167, 0x0 } },
+                // Na Halant Dha
+                { { 0x09a8, 0x09cd, 0x09a7, 0x0 },
+                  { 0x01d3, 0x0 } },
+                // Na Halant ZWNJ Dha
+                { { 0x09a8, 0x09cd, 0x200c, 0x09a7, 0x0 },
+                  { 0x0164, 0x017d, 0x0163, 0x0 } },
+                // Na Halant ZWJ Dha
+                { { 0x09a8, 0x09cd, 0x200d, 0x09a7, 0x0 },
+                  { 0x026f, 0x0163, 0x0 } },
+                // Ra Halant Ka MatraAU
+                { { 0x09b0, 0x09cd, 0x0995, 0x09cc, 0x0 },
+                  { 0x0179, 0x0151, 0x0276, 0x017e, 0x0 } },
+                // Ra Halant Ba Halant Ba
+                { { 0x09b0, 0x09cd, 0x09ac, 0x09cd, 0x09ac, 0x0 },
+                  { 0x0232, 0x0276, 0x0 } },
                 { { 0x9b0, 0x9cd, 0x995, 0x9be, 0x982, 0x0 },
                   { 0x151, 0x276, 0x172, 0x143, 0x0 } },
                 { { 0x9b0, 0x9cd, 0x995, 0x9be, 0x983, 0x0 },
-                  { 0x151, 0x276, 0x172, 0x144, 0x0 } }, 
+                  { 0x151, 0x276, 0x172, 0x144, 0x0 } },
                 // test decomposed two parts matras
                 { { 0x995, 0x9c7, 0x9be, 0x0 },
                   { 0x179, 0x151, 0x172, 0x0 } },
                 { { 0x995, 0x9c7, 0x9d7, 0x0 },
                   { 0x179, 0x151, 0x17e, 0x0 } },
-		{ {0}, {0} }
-	    };
-        prepareShapingTest(f, shape_table);
-	} else
-	    QSKIP("couldn't find Akaash");
+                { {0}, {0} }
+            };
+            prepareShapingTest(f, shape_table);
+        } else
+            QSKIP("couldn't find Akaash");
     }
     {
         if (QFontDatabase().families(QFontDatabase::Bengali).contains("Mukti Narrow")) {
             QFont f("Mukti Narrow");
-	    const ShapeTable shape_table [] = {
-		// Ka
-		{ { 0x0995, 0x0 },
-		  { 0x0073, 0x0 } },
-		// Ka Halant
-		{ { 0x0995, 0x09cd, 0x0 },
-		  { 0x00b9, 0x0 } },
-		// Ka Halant Ka
-		{ { 0x0995, 0x09cd, 0x0995, 0x0 },
-		  { 0x0109, 0x0 } },
-		// Ka MatraI
-		{ { 0x0995, 0x09bf, 0x0 },
-		  { 0x0095, 0x0073, 0x0 } },
-		// Ra Halant Ka
-		{ { 0x09b0, 0x09cd, 0x0995, 0x0 },
-		  { 0x0073, 0x00e1, 0x0 } },
-		// Ra Halant Ka MatraI
-		{ { 0x09b0, 0x09cd, 0x0995, 0x09bf, 0x0 },
-		  { 0x0095, 0x0073, 0x00e1, 0x0 } },
-		// MatraI
- 		{ { 0x09bf, 0x0 },
-		  { 0x0095, 0x01c8, 0x0 } },
-		// Ka Nukta
-		{ { 0x0995, 0x09bc, 0x0 },
-		  { 0x0073, 0x0093, 0x0 } },
-		// Ka Halant Ra
-		{ { 0x0995, 0x09cd, 0x09b0, 0x0 },
-		  { 0x00e5, 0x0 } },
-		// Ka Halant Ra Halant Ka
+            const ShapeTable shape_table [] = {
+                // Ka
+                { { 0x0995, 0x0 },
+                  { 0x0073, 0x0 } },
+                // Ka Halant
+                { { 0x0995, 0x09cd, 0x0 },
+                  { 0x00b9, 0x0 } },
+                // Ka Halant Ka
+                { { 0x0995, 0x09cd, 0x0995, 0x0 },
+                  { 0x0109, 0x0 } },
+                // Ka MatraI
+                { { 0x0995, 0x09bf, 0x0 },
+                  { 0x0095, 0x0073, 0x0 } },
+                // Ra Halant Ka
+                { { 0x09b0, 0x09cd, 0x0995, 0x0 },
+                  { 0x0073, 0x00e1, 0x0 } },
+                // Ra Halant Ka MatraI
+                { { 0x09b0, 0x09cd, 0x0995, 0x09bf, 0x0 },
+                  { 0x0095, 0x0073, 0x00e1, 0x0 } },
+                // MatraI
+                { { 0x09bf, 0x0 },
+                  { 0x0095, 0x01c8, 0x0 } },
+                // Ka Nukta
+                { { 0x0995, 0x09bc, 0x0 },
+                  { 0x0073, 0x0093, 0x0 } },
+                // Ka Halant Ra
+                { { 0x0995, 0x09cd, 0x09b0, 0x0 },
+                  { 0x00e5, 0x0 } },
+                // Ka Halant Ra Halant Ka
                 { { 0x995, 0x9cd, 0x9b0, 0x9cd, 0x995, 0x0 },
-                  { 0x234, 0x24e, 0x73, 0x0 } }, 
-		// Ya + Halant
-		{ { 0x09af, 0x09cd, 0x0 },
-		  { 0x00d2, 0x0 } },
-		// Da Halant Ya -> Da Ya-Phala
-		{ { 0x09a6, 0x09cd, 0x09af, 0x0 },
-		  { 0x0084, 0x00e2, 0x0 } },
-		// A Halant Ya -> A Ya-phala
-		{ { 0x0985, 0x09cd, 0x09af, 0x0 },
-		  { 0x0067, 0x00e2, 0x0 } },
-		// Na Halant Ka
-		{ { 0x09a8, 0x09cd, 0x0995, 0x0 },
-		  { 0x0188, 0x0 } },
-		// Na Halant ZWNJ Ka
+                  { 0x234, 0x24e, 0x73, 0x0 } },
+                // Ya + Halant
+                { { 0x09af, 0x09cd, 0x0 },
+                  { 0x00d2, 0x0 } },
+                // Da Halant Ya -> Da Ya-Phala
+                { { 0x09a6, 0x09cd, 0x09af, 0x0 },
+                  { 0x0084, 0x00e2, 0x0 } },
+                // A Halant Ya -> A Ya-phala
+                { { 0x0985, 0x09cd, 0x09af, 0x0 },
+                  { 0x0067, 0x00e2, 0x0 } },
+                // Na Halant Ka
+                { { 0x09a8, 0x09cd, 0x0995, 0x0 },
+                  { 0x0188, 0x0 } },
+                // Na Halant ZWNJ Ka
                 { { 0x9a8, 0x9cd, 0x200c, 0x995, 0x0 },
-                  { 0xcc, 0x73, 0x0 } }, 
-		// Na Halant ZWJ Ka
+                  { 0xcc, 0x73, 0x0 } },
+                // Na Halant ZWJ Ka
                 { { 0x9a8, 0x9cd, 0x200d, 0x995, 0x0 },
-                  { 0x247, 0x73, 0x0 } }, 
-		// Ka Halant ZWNJ Ka
+                  { 0x247, 0x73, 0x0 } },
+                // Ka Halant ZWNJ Ka
                 { { 0x9a8, 0x9cd, 0x200d, 0x995, 0x0 },
-                  { 0x247, 0x73, 0x0 } }, 
-		// Ka Halant ZWJ Ka
+                  { 0x247, 0x73, 0x0 } },
+                // Ka Halant ZWJ Ka
                 { { 0x9a8, 0x9cd, 0x200d, 0x995, 0x0 },
-                  { 0x247, 0x73, 0x0 } }, 
-		// Na Halant Ra
-		{ { 0x09a8, 0x09cd, 0x09b0, 0x0 },
-		  { 0x00f8, 0x0 } },
-		// Na Halant ZWNJ Ra
-		{ { 0x09a8, 0x09cd, 0x200c, 0x09b0, 0x0 },
-		  { 0xcc, 0x8d, 0x0 } },
-		// Na Halant ZWJ Ra
+                  { 0x247, 0x73, 0x0 } },
+                // Na Halant Ra
+                { { 0x09a8, 0x09cd, 0x09b0, 0x0 },
+                  { 0x00f8, 0x0 } },
+                // Na Halant ZWNJ Ra
+                { { 0x09a8, 0x09cd, 0x200c, 0x09b0, 0x0 },
+                  { 0xcc, 0x8d, 0x0 } },
+                // Na Halant ZWJ Ra
                 { { 0x9a8, 0x9cd, 0x200d, 0x9b0, 0x0 },
-                  { 0x247, 0x8d, 0x0 } }, 
-		// Na Halant Ba
-		{ { 0x09a8, 0x09cd, 0x09ac, 0x0 },
-		  { 0x0139, 0x0 } },
-		// Na Halant ZWNJ Ba
+                  { 0x247, 0x8d, 0x0 } },
+                // Na Halant Ba
+                { { 0x09a8, 0x09cd, 0x09ac, 0x0 },
+                  { 0x0139, 0x0 } },
+                // Na Halant ZWNJ Ba
                 { { 0x9a8, 0x9cd, 0x200c, 0x9ac, 0x0 },
-                  { 0xcc, 0x89, 0x0 } }, 
-		// Na Halant ZWJ Ba
+                  { 0xcc, 0x89, 0x0 } },
+                // Na Halant ZWJ Ba
                 { { 0x9a8, 0x9cd, 0x200d, 0x9ac, 0x0 },
-                  { 0x247, 0x89, 0x0 } }, 
-		// Na Halant Dha
-		{ { 0x09a8, 0x09cd, 0x09a7, 0x0 },
-		  { 0x0145, 0x0 } },
-		// Na Halant ZWNJ Dha
-		{ { 0x09a8, 0x09cd, 0x200c, 0x09a7, 0x0 },
-		  { 0xcc, 0x85, 0x0 } },
-		// Na Halant ZWJ Dha
-		{ { 0x09a8, 0x09cd, 0x200d, 0x09a7, 0x0 },
-		  { 0x247, 0x85, 0x0 } },
-		// Ra Halant Ka MatraAU
+                  { 0x247, 0x89, 0x0 } },
+                // Na Halant Dha
+                { { 0x09a8, 0x09cd, 0x09a7, 0x0 },
+                  { 0x0145, 0x0 } },
+                // Na Halant ZWNJ Dha
+                { { 0x09a8, 0x09cd, 0x200c, 0x09a7, 0x0 },
+                  { 0xcc, 0x85, 0x0 } },
+                // Na Halant ZWJ Dha
+                { { 0x09a8, 0x09cd, 0x200d, 0x09a7, 0x0 },
+                  { 0x247, 0x85, 0x0 } },
+                // Ra Halant Ka MatraAU
                 { { 0x9b0, 0x9cd, 0x995, 0x9cc, 0x0 },
-                  { 0x232, 0x73, 0xe1, 0xa0, 0x0 } }, 
-		// Ra Halant Ba Halant Ba
-		{ { 0x09b0, 0x09cd, 0x09ac, 0x09cd, 0x09ac, 0x0 },
-		  { 0x013b, 0x00e1, 0x0 } },
-
-		{ {0}, {0} }
-	    };
-        prepareShapingTest(f, shape_table);
-	} else
-	    QSKIP("couldn't find Mukti");
+                  { 0x232, 0x73, 0xe1, 0xa0, 0x0 } },
+                // Ra Halant Ba Halant Ba
+                { { 0x09b0, 0x09cd, 0x09ac, 0x09cd, 0x09ac, 0x0 },
+                  { 0x013b, 0x00e1, 0x0 } },
+
+                { {0}, {0} }
+            };
+            prepareShapingTest(f, shape_table);
+        } else
+            QSKIP("couldn't find Mukti");
     }
     {
         if (QFontDatabase().families(QFontDatabase::Bengali).contains("Likhan")) {
             QFont f("Likhan");
-	    const ShapeTable shape_table [] = {
+            const ShapeTable shape_table [] = {
                 { { 0x9a8, 0x9cd, 0x9af, 0x0 },
                   { 0x1ca, 0x0 } },
-		{ { 0x09b8, 0x09cd, 0x09af, 0x0 },
+                { { 0x09b8, 0x09cd, 0x09af, 0x0 },
                   { 0x020e, 0x0 } },
-		{ { 0x09b6, 0x09cd, 0x09af, 0x0 },
+                { { 0x09b6, 0x09cd, 0x09af, 0x0 },
                   { 0x01f4, 0x0 } },
-		{ { 0x09b7, 0x09cd, 0x09af, 0x0 },
+                { { 0x09b7, 0x09cd, 0x09af, 0x0 },
                   { 0x01fe, 0x0 } },
-		{ { 0x09b0, 0x09cd, 0x09a8, 0x09cd, 0x200d, 0x0 },
+                { { 0x09b0, 0x09cd, 0x09a8, 0x09cd, 0x200d, 0x0 },
                   { 0x10b, 0x167, 0x0 } },
 
-		{ {0}, {0} }
-	    };
-        prepareShapingTest(f, shape_table);
-	} else
-	    QSKIP("couldn't find Likhan");
+                { {0}, {0} }
+            };
+            prepareShapingTest(f, shape_table);
+        } else
+            QSKIP("couldn't find Likhan");
     }
 }
 
@@ -555,14 +555,14 @@ void tst_QTextScriptEngine::gurmukhi_data()
     {
         if (QFontDatabase().families(QFontDatabase::Gurmukhi).contains("Lohit Punjabi")) {
             QFont f("Lohit Punjabi");
-	    const ShapeTable shape_table [] = {
-		{ { 0xA15, 0xA4D, 0xa39, 0x0 },
-		  { 0x3b, 0x8b, 0x0 } },
-		{ {0}, {0} }
-	    };
-        prepareShapingTest(f, shape_table);
-	} else
-	    QSKIP("couldn't find Lohit Punjabi");
+            const ShapeTable shape_table [] = {
+                { { 0xA15, 0xA4D, 0xa39, 0x0 },
+                  { 0x3b, 0x8b, 0x0 } },
+                { {0}, {0} }
+            };
+            prepareShapingTest(f, shape_table);
+        } else
+            QSKIP("couldn't find Lohit Punjabi");
     }
 }
 
@@ -583,27 +583,27 @@ void tst_QTextScriptEngine::oriya_data()
     {
         if (QFontDatabase().families(QFontDatabase::Oriya).contains("utkal")) {
             QFont f("utkal");
-	    const ShapeTable shape_table [] = {
+            const ShapeTable shape_table [] = {
                 { { 0xb15, 0xb4d, 0xb24, 0xb4d, 0xb30, 0x0 },
-                  { 0x150, 0x125, 0x0 } }, 
+                  { 0x150, 0x125, 0x0 } },
                 { { 0xb24, 0xb4d, 0xb24, 0xb4d, 0xb2c, 0x0 },
-                  { 0x151, 0x120, 0x0 } }, 
+                  { 0x151, 0x120, 0x0 } },
                 { { 0xb28, 0xb4d, 0xb24, 0xb4d, 0xb2c, 0x0 },
-                  { 0x152, 0x120, 0x0 } }, 
+                  { 0x152, 0x120, 0x0 } },
                 { { 0xb28, 0xb4d, 0xb24, 0xb4d, 0xb2c, 0x0 },
-                  { 0x152, 0x120, 0x0 } }, 
+                  { 0x152, 0x120, 0x0 } },
                 { { 0xb28, 0xb4d, 0xb24, 0xb4d, 0xb30, 0x0 },
-                  { 0x176, 0x0 } }, 
+                  { 0x176, 0x0 } },
                 { { 0xb38, 0xb4d, 0xb24, 0xb4d, 0xb30, 0x0 },
-                  { 0x177, 0x0 } }, 
+                  { 0x177, 0x0 } },
                 { { 0xb28, 0xb4d, 0xb24, 0xb4d, 0xb30, 0xb4d, 0xb2f, 0x0 },
-                  { 0x176, 0x124, 0x0 } }, 
+                  { 0x176, 0x124, 0x0 } },
                 { {0}, {0} }
 
             };
-        prepareShapingTest(f, shape_table);
-	} else
-	    QSKIP("couldn't find utkal");
+            prepareShapingTest(f, shape_table);
+        } else
+            QSKIP("couldn't find utkal");
     }
 }
 
@@ -624,51 +624,51 @@ void tst_QTextScriptEngine::tamil_data()
     {
         if (QFontDatabase().families(QFontDatabase::Tamil).contains("AkrutiTml1")) {
             QFont f("AkrutiTml1");
-	    const ShapeTable shape_table [] = {
-		{ { 0x0b95, 0x0bc2, 0x0 },
-		  { 0x004e, 0x0 } },
-		{ { 0x0bae, 0x0bc2, 0x0 },
-		  { 0x009e, 0x0 } },
-		{ { 0x0b9a, 0x0bc2, 0x0 },
-		  { 0x0058, 0x0 } },
-		{ { 0x0b99, 0x0bc2, 0x0 },
-		  { 0x0053, 0x0 } },
-		{ { 0x0bb0, 0x0bc2, 0x0 },
-		  { 0x00a8, 0x0 } },
-		{ { 0x0ba4, 0x0bc2, 0x0 },
-		  { 0x008e, 0x0 } },
-		{ { 0x0b9f, 0x0bc2, 0x0 },
-		  { 0x0062, 0x0 } },
-		{ { 0x0b95, 0x0bc6, 0x0 },
-		  { 0x000a, 0x0031, 0x0 } },
-		{ { 0x0b95, 0x0bca, 0x0 },
-		  { 0x000a, 0x0031, 0x0007, 0x0 } },
-		{ { 0x0b95, 0x0bc6, 0x0bbe, 0x0 },
-		  { 0x000a, 0x0031, 0x007, 0x0 } },
-		{ { 0x0b95, 0x0bcd, 0x0bb7, 0x0 },
-		  { 0x0049, 0x0 } },
-		{ { 0x0b95, 0x0bcd, 0x0bb7, 0x0bca, 0x0 },
-		  { 0x000a, 0x0049, 0x007, 0x0 } },
-		{ { 0x0b95, 0x0bcd, 0x0bb7, 0x0bc6, 0x0bbe, 0x0 },
-		  { 0x000a, 0x0049, 0x007, 0x0 } },
-		{ { 0x0b9f, 0x0bbf, 0x0 },
-		  { 0x005f, 0x0 } },
-		{ { 0x0b9f, 0x0bc0, 0x0 },
-		  { 0x0060, 0x0 } },
-		{ { 0x0bb2, 0x0bc0, 0x0 },
-		  { 0x00ab, 0x0 } },
-		{ { 0x0bb2, 0x0bbf, 0x0 },
-		  { 0x00aa, 0x0 } },
-		{ { 0x0bb0, 0x0bcd, 0x0 },
-		  { 0x00a4, 0x0 } },
-		{ { 0x0bb0, 0x0bbf, 0x0 },
-		  { 0x00a5, 0x0 } },
-		{ { 0x0bb0, 0x0bc0, 0x0 },
-		  { 0x00a6, 0x0 } },
-		{ { 0x0b83, 0x0 },
-		  { 0x0025, 0x0 } },
-		{ { 0x0b83, 0x0b95, 0x0 },
-		  { 0x0025, 0x0031, 0x0 } },
+            const ShapeTable shape_table [] = {
+                { { 0x0b95, 0x0bc2, 0x0 },
+                  { 0x004e, 0x0 } },
+                { { 0x0bae, 0x0bc2, 0x0 },
+                  { 0x009e, 0x0 } },
+                { { 0x0b9a, 0x0bc2, 0x0 },
+                  { 0x0058, 0x0 } },
+                { { 0x0b99, 0x0bc2, 0x0 },
+                  { 0x0053, 0x0 } },
+                { { 0x0bb0, 0x0bc2, 0x0 },
+                  { 0x00a8, 0x0 } },
+                { { 0x0ba4, 0x0bc2, 0x0 },
+                  { 0x008e, 0x0 } },
+                { { 0x0b9f, 0x0bc2, 0x0 },
+                  { 0x0062, 0x0 } },
+                { { 0x0b95, 0x0bc6, 0x0 },
+                  { 0x000a, 0x0031, 0x0 } },
+                { { 0x0b95, 0x0bca, 0x0 },
+                  { 0x000a, 0x0031, 0x0007, 0x0 } },
+                { { 0x0b95, 0x0bc6, 0x0bbe, 0x0 },
+                  { 0x000a, 0x0031, 0x007, 0x0 } },
+                { { 0x0b95, 0x0bcd, 0x0bb7, 0x0 },
+                  { 0x0049, 0x0 } },
+                { { 0x0b95, 0x0bcd, 0x0bb7, 0x0bca, 0x0 },
+                  { 0x000a, 0x0049, 0x007, 0x0 } },
+                { { 0x0b95, 0x0bcd, 0x0bb7, 0x0bc6, 0x0bbe, 0x0 },
+                  { 0x000a, 0x0049, 0x007, 0x0 } },
+                { { 0x0b9f, 0x0bbf, 0x0 },
+                  { 0x005f, 0x0 } },
+                { { 0x0b9f, 0x0bc0, 0x0 },
+                  { 0x0060, 0x0 } },
+                { { 0x0bb2, 0x0bc0, 0x0 },
+                  { 0x00ab, 0x0 } },
+                { { 0x0bb2, 0x0bbf, 0x0 },
+                  { 0x00aa, 0x0 } },
+                { { 0x0bb0, 0x0bcd, 0x0 },
+                  { 0x00a4, 0x0 } },
+                { { 0x0bb0, 0x0bbf, 0x0 },
+                  { 0x00a5, 0x0 } },
+                { { 0x0bb0, 0x0bc0, 0x0 },
+                  { 0x00a6, 0x0 } },
+                { { 0x0b83, 0x0 },
+                  { 0x0025, 0x0 } },
+                { { 0x0b83, 0x0b95, 0x0 },
+                  { 0x0025, 0x0031, 0x0 } },
                 { { 0xb95, 0xbc6, 0xbbe, 0x0 },
                   { 0xa, 0x31, 0x7, 0x0 } },
                 { { 0xb95, 0xbc7, 0xbbe, 0x0 },
@@ -676,11 +676,11 @@ void tst_QTextScriptEngine::tamil_data()
                 { { 0xb95, 0xbc6, 0xbd7, 0x0 },
                   { 0xa, 0x31, 0x40, 0x0 } },
 
-		{ {0}, {0} }
-	    };
-        prepareShapingTest(f, shape_table);
-	} else
-	    QSKIP("couldn't find AkrutiTml1");
+                { {0}, {0} }
+            };
+            prepareShapingTest(f, shape_table);
+        } else
+            QSKIP("couldn't find AkrutiTml1");
     }
 }
 
@@ -701,35 +701,35 @@ void tst_QTextScriptEngine::telugu_data()
     {
         if (QFontDatabase().families(QFontDatabase::Telugu).contains("Pothana2000")) {
             QFont f("Pothana2000");
-	    const ShapeTable shape_table [] = {
+            const ShapeTable shape_table [] = {
                 { { 0xc15, 0xc4d, 0x0 },
-                  { 0xbb, 0x0 } }, 
+                  { 0xbb, 0x0 } },
                 { { 0xc15, 0xc4d, 0xc37, 0x0 },
-                  { 0x4b, 0x0 } }, 
+                  { 0x4b, 0x0 } },
                 { { 0xc15, 0xc4d, 0xc37, 0xc4d, 0x0 },
-                  { 0xe0, 0x0 } }, 
+                  { 0xe0, 0x0 } },
                 { { 0xc15, 0xc4d, 0xc37, 0xc4d, 0xc23, 0x0 },
-                  { 0x4b, 0x91, 0x0 } }, 
+                  { 0x4b, 0x91, 0x0 } },
                 { { 0xc15, 0xc4d, 0xc30, 0x0 },
-                  { 0x5a, 0xb2, 0x0 } }, 
+                  { 0x5a, 0xb2, 0x0 } },
                 { { 0xc15, 0xc4d, 0xc30, 0xc4d, 0x0 },
-                  { 0xbb, 0xb2, 0x0 } }, 
+                  { 0xbb, 0xb2, 0x0 } },
                 { { 0xc15, 0xc4d, 0xc30, 0xc4d, 0xc15, 0x0 },
-                  { 0x5a, 0xb2, 0x83, 0x0 } }, 
+                  { 0x5a, 0xb2, 0x83, 0x0 } },
                 { { 0xc15, 0xc4d, 0xc30, 0xc3f, 0x0 },
-                  { 0xe2, 0xb2, 0x0 } }, 
+                  { 0xe2, 0xb2, 0x0 } },
                 { { 0xc15, 0xc4d, 0xc15, 0xc48, 0x0 },
                   { 0xe6, 0xb3, 0x83, 0x0 } },
                 { { 0xc15, 0xc4d, 0xc30, 0xc48, 0x0 },
-                  { 0xe6, 0xb3, 0x9f, 0x0 } }, 
+                  { 0xe6, 0xb3, 0x9f, 0x0 } },
                 { { 0xc15, 0xc46, 0xc56, 0x0 },
                   { 0xe6, 0xb3, 0x0 } },
                 { {0}, {0} }
 
             };
-        prepareShapingTest(f, shape_table);
-	} else
-	    QSKIP("couldn't find Pothana2000");
+            prepareShapingTest(f, shape_table);
+        } else
+            QSKIP("couldn't find Pothana2000");
     }
 }
 
@@ -750,42 +750,42 @@ void tst_QTextScriptEngine::kannada_data()
     {
         if (QFontDatabase().families(QFontDatabase::Kannada).contains("Sampige")) {
             QFont f("Sampige");
-	    const ShapeTable shape_table [] = {
-		{ { 0x0ca8, 0x0ccd, 0x0ca8, 0x0 },
-		  { 0x0049, 0x00ba, 0x0 } },
-		{ { 0x0ca8, 0x0ccd, 0x0ca1, 0x0 },
-		  { 0x0049, 0x00b3, 0x0 } },
-		{ { 0x0caf, 0x0cc2, 0x0 },
-		  { 0x004f, 0x005d, 0x0 } },
-		{ { 0x0ce0, 0x0 },
-		  { 0x006a, 0x0 } },
-		{ { 0x0ce6, 0x0ce7, 0x0ce8, 0x0 },
-		  { 0x006b, 0x006c, 0x006d, 0x0 } },
-		{ { 0x0cb5, 0x0ccb, 0x0 },
-		  { 0x015f, 0x0067, 0x0 } },
-		{ { 0x0cb0, 0x0ccd, 0x0cae, 0x0 },
-		  { 0x004e, 0x0082, 0x0 } },
-		{ { 0x0cb0, 0x0ccd, 0x0c95, 0x0 },
-		  { 0x0036, 0x0082, 0x0 } },
-		{ { 0x0c95, 0x0ccd, 0x0cb0, 0x0 },
-		  { 0x0036, 0x00c1, 0x0 } },
-		{ { 0x0cb0, 0x0ccd, 0x200d, 0x0c95, 0x0 },
-		  { 0x0050, 0x00a7, 0x0 } },
-
-		{ {0}, {0} }
-	    };
-        prepareShapingTest(f, shape_table);
-	} else
-	    QSKIP("couldn't find Sampige");
+            const ShapeTable shape_table [] = {
+                { { 0x0ca8, 0x0ccd, 0x0ca8, 0x0 },
+                  { 0x0049, 0x00ba, 0x0 } },
+                { { 0x0ca8, 0x0ccd, 0x0ca1, 0x0 },
+                  { 0x0049, 0x00b3, 0x0 } },
+                { { 0x0caf, 0x0cc2, 0x0 },
+                  { 0x004f, 0x005d, 0x0 } },
+                { { 0x0ce0, 0x0 },
+                  { 0x006a, 0x0 } },
+                { { 0x0ce6, 0x0ce7, 0x0ce8, 0x0 },
+                  { 0x006b, 0x006c, 0x006d, 0x0 } },
+                { { 0x0cb5, 0x0ccb, 0x0 },
+                  { 0x015f, 0x0067, 0x0 } },
+                { { 0x0cb0, 0x0ccd, 0x0cae, 0x0 },
+                  { 0x004e, 0x0082, 0x0 } },
+                { { 0x0cb0, 0x0ccd, 0x0c95, 0x0 },
+                  { 0x0036, 0x0082, 0x0 } },
+                { { 0x0c95, 0x0ccd, 0x0cb0, 0x0 },
+                  { 0x0036, 0x00c1, 0x0 } },
+                { { 0x0cb0, 0x0ccd, 0x200d, 0x0c95, 0x0 },
+                  { 0x0050, 0x00a7, 0x0 } },
+
+                { {0}, {0} }
+            };
+            prepareShapingTest(f, shape_table);
+        } else
+            QSKIP("couldn't find Sampige");
     }
     {
         if (QFontDatabase().families(QFontDatabase::Kannada).contains("Tunga")) {
             QFont f("Tunga");
-	    const ShapeTable shape_table [] = {
-		{ { 0x0cb7, 0x0cc6, 0x0 },
-		  { 0x00b0, 0x006c, 0x0 } },
-		{ { 0x0cb7, 0x0ccd, 0x0 },
-		  { 0x0163, 0x0 } },
+            const ShapeTable shape_table [] = {
+                { { 0x0cb7, 0x0cc6, 0x0 },
+                  { 0x00b0, 0x006c, 0x0 } },
+                { { 0x0cb7, 0x0ccd, 0x0 },
+                  { 0x0163, 0x0 } },
                 { { 0xc95, 0xcbf, 0xcd5, 0x0 },
                   { 0x114, 0x73, 0x0 } },
                 { { 0xc95, 0xcc6, 0xcd5, 0x0 },
@@ -796,11 +796,11 @@ void tst_QTextScriptEngine::kannada_data()
                   { 0x90, 0x6c, 0x69, 0x0 } },
                 { { 0xc95, 0xcca, 0xcd5, 0x0 },
                   { 0x90, 0x6c, 0x69, 0x73, 0x0 } },
-		{ {0}, {0} }
-	    };
-        prepareShapingTest(f, shape_table);
-	} else
-	    QSKIP("couldn't find Tunga");
+                { {0}, {0} }
+            };
+            prepareShapingTest(f, shape_table);
+        } else
+            QSKIP("couldn't find Tunga");
     }
 }
 
@@ -821,33 +821,33 @@ void tst_QTextScriptEngine::malayalam_data()
     {
         if (QFontDatabase().families(QFontDatabase::Malayalam).contains("AkrutiMal2")) {
             QFont f("AkrutiMal2");
-	    const ShapeTable shape_table [] = {
-		{ { 0x0d15, 0x0d46, 0x0 },
-		  { 0x005e, 0x0034, 0x0 } },
-		{ { 0x0d15, 0x0d47, 0x0 },
-		  { 0x005f, 0x0034, 0x0 } },
-		{ { 0x0d15, 0x0d4b, 0x0 },
-		  { 0x005f, 0x0034, 0x0058, 0x0 } },
-		{ { 0x0d15, 0x0d48, 0x0 },
-		  { 0x0060, 0x0034, 0x0 } },
-		{ { 0x0d15, 0x0d4a, 0x0 },
-		  { 0x005e, 0x0034, 0x0058, 0x0 } },
-		{ { 0x0d30, 0x0d4d, 0x0d15, 0x0 },
-		  { 0x009e, 0x0034, 0x0 } },
-		{ { 0x0d15, 0x0d4d, 0x0d35, 0x0 },
-		  { 0x0034, 0x007a, 0x0 } },
-		{ { 0x0d15, 0x0d4d, 0x0d2f, 0x0 },
-		  { 0x0034, 0x00a2, 0x0 } },
-		{ { 0x0d1f, 0x0d4d, 0x0d1f, 0x0 },
-		  { 0x0069, 0x0 } },
-		{ { 0x0d26, 0x0d4d, 0x0d26, 0x0 },
-		  { 0x0074, 0x0 } },
-		{ { 0x0d30, 0x0d4d, 0x0 },
-		  { 0x009e, 0x0 } },
-		{ { 0x0d30, 0x0d4d, 0x200c, 0x0 },
-		  { 0x009e, 0x0 } },
-		{ { 0x0d30, 0x0d4d, 0x200d, 0x0 },
-		  { 0x009e, 0x0 } },
+            const ShapeTable shape_table [] = {
+                { { 0x0d15, 0x0d46, 0x0 },
+                  { 0x005e, 0x0034, 0x0 } },
+                { { 0x0d15, 0x0d47, 0x0 },
+                  { 0x005f, 0x0034, 0x0 } },
+                { { 0x0d15, 0x0d4b, 0x0 },
+                  { 0x005f, 0x0034, 0x0058, 0x0 } },
+                { { 0x0d15, 0x0d48, 0x0 },
+                  { 0x0060, 0x0034, 0x0 } },
+                { { 0x0d15, 0x0d4a, 0x0 },
+                  { 0x005e, 0x0034, 0x0058, 0x0 } },
+                { { 0x0d30, 0x0d4d, 0x0d15, 0x0 },
+                  { 0x009e, 0x0034, 0x0 } },
+                { { 0x0d15, 0x0d4d, 0x0d35, 0x0 },
+                  { 0x0034, 0x007a, 0x0 } },
+                { { 0x0d15, 0x0d4d, 0x0d2f, 0x0 },
+                  { 0x0034, 0x00a2, 0x0 } },
+                { { 0x0d1f, 0x0d4d, 0x0d1f, 0x0 },
+                  { 0x0069, 0x0 } },
+                { { 0x0d26, 0x0d4d, 0x0d26, 0x0 },
+                  { 0x0074, 0x0 } },
+                { { 0x0d30, 0x0d4d, 0x0 },
+                  { 0x009e, 0x0 } },
+                { { 0x0d30, 0x0d4d, 0x200c, 0x0 },
+                  { 0x009e, 0x0 } },
+                { { 0x0d30, 0x0d4d, 0x200d, 0x0 },
+                  { 0x009e, 0x0 } },
                 { { 0xd15, 0xd46, 0xd3e, 0x0 },
                   { 0x5e, 0x34, 0x58, 0x0 } },
                 { { 0xd15, 0xd47, 0xd3e, 0x0 },
@@ -856,11 +856,11 @@ void tst_QTextScriptEngine::malayalam_data()
                   { 0x5e, 0x34, 0x65, 0x0 } },
                 { { 0xd15, 0xd57, 0x0 },
                   { 0x34, 0x65, 0x0 } },
-		{ {0}, {0} }
-	    };
-        prepareShapingTest(f, shape_table);
-	} else
-	    QSKIP("couldn't find AkrutiMal2");
+                { {0}, {0} }
+            };
+            prepareShapingTest(f, shape_table);
+        } else
+            QSKIP("couldn't find AkrutiMal2");
     }
     {
         if (QFontDatabase().families(QFontDatabase::Malayalam).contains("Rachana")) {
@@ -879,7 +879,7 @@ void tst_QTextScriptEngine::malayalam_data()
 
                 { {0}, {0} }
             };
-        prepareShapingTest(f, shape_table);
+            prepareShapingTest(f, shape_table);
         } else
             QSKIP("couldn't find Rachana");
     }
@@ -917,7 +917,7 @@ void tst_QTextScriptEngine::sinhala_data()
                   { 0x4a, 0x61, 0x42, 0x41, 0x0 } },
                 { {0}, {0} }
             };
-        prepareShapingTest(f, shape_table);
+            prepareShapingTest(f, shape_table);
         } else
             QSKIP("couldn't find Malithi Web");
     }
@@ -940,30 +940,30 @@ void tst_QTextScriptEngine::khmer_data()
     {
         if (QFontDatabase().families(QFontDatabase::Khmer).contains("Khmer OS")) {
             QFont f("Khmer OS");
-	    const ShapeTable shape_table [] = {
-		{ { 0x179a, 0x17cd, 0x0 },
-		  { 0x24c, 0x27f, 0x0 } },
-		{ { 0x179f, 0x17c5, 0x0 },
-		  { 0x273, 0x203, 0x0 } },
-		{ { 0x1790, 0x17d2, 0x1784, 0x17c3, 0x0 },
-		  { 0x275, 0x242, 0x182, 0x0 } },
-		{ { 0x179a, 0x0 },
-		  { 0x24c, 0x0 } },
-		{ { 0x1781, 0x17d2, 0x1798, 0x17c2, 0x0 },
-		  { 0x274, 0x233, 0x197, 0x0 } },
-		{ { 0x1798, 0x17b6, 0x0 },
-		  { 0x1cb, 0x0 } },
-		{ { 0x179a, 0x17b8, 0x0 },
-		  { 0x24c, 0x26a, 0x0 } },
-		{ { 0x1787, 0x17b6, 0x0 },
-		  { 0x1ba, 0x0 } },
-		{ { 0x1798, 0x17d2, 0x1796, 0x17bb, 0x0 },
-		  { 0x24a, 0x195, 0x26d, 0x0 } },
-		{ {0}, {0} }
-	    };
-        prepareShapingTest(f, shape_table);
-	} else
-	    QSKIP("couldn't find Khmer OS");
+            const ShapeTable shape_table [] = {
+                { { 0x179a, 0x17cd, 0x0 },
+                  { 0x24c, 0x27f, 0x0 } },
+                { { 0x179f, 0x17c5, 0x0 },
+                  { 0x273, 0x203, 0x0 } },
+                { { 0x1790, 0x17d2, 0x1784, 0x17c3, 0x0 },
+                  { 0x275, 0x242, 0x182, 0x0 } },
+                { { 0x179a, 0x0 },
+                  { 0x24c, 0x0 } },
+                { { 0x1781, 0x17d2, 0x1798, 0x17c2, 0x0 },
+                  { 0x274, 0x233, 0x197, 0x0 } },
+                { { 0x1798, 0x17b6, 0x0 },
+                  { 0x1cb, 0x0 } },
+                { { 0x179a, 0x17b8, 0x0 },
+                  { 0x24c, 0x26a, 0x0 } },
+                { { 0x1787, 0x17b6, 0x0 },
+                  { 0x1ba, 0x0 } },
+                { { 0x1798, 0x17d2, 0x1796, 0x17bb, 0x0 },
+                  { 0x24a, 0x195, 0x26d, 0x0 } },
+                { {0}, {0} }
+            };
+            prepareShapingTest(f, shape_table);
+        } else
+            QSKIP("couldn't find Khmer OS");
     }
 }
 
@@ -984,14 +984,14 @@ void tst_QTextScriptEngine::linearB_data()
     {
         if (QFontDatabase().families(QFontDatabase::Any).contains("Penuturesu")) {
             QFont f("Penuturesu");
-	    const ShapeTable shape_table [] = {
-		{ { 0xd800, 0xdc01, 0xd800, 0xdc02, 0xd800, 0xdc03,  0 },
+            const ShapeTable shape_table [] = {
+                { { 0xd800, 0xdc01, 0xd800, 0xdc02, 0xd800, 0xdc03,  0 },
                   { 0x5, 0x6, 0x7, 0 } },
-		{ {0}, {0} }
-	    };
-        prepareShapingTest(f, shape_table);
-	} else
-	    QSKIP("couldn't find Penuturesu");
+                { {0}, {0} }
+            };
+            prepareShapingTest(f, shape_table);
+        } else
+            QSKIP("couldn't find Penuturesu");
     }
 }
 
@@ -1134,8 +1134,8 @@ void tst_QTextScriptEngine::mirroredChars()
     s.append(QLatin1Char('('));
     s.append(QLatin1Char(')'));
 
-    HB_Glyph leftParenthesis;
-    HB_Glyph rightParenthesis;
+    glyph_t leftParenthesis;
+    glyph_t rightParenthesis;
     {
         QTextLayout layout(s);
         layout.setCacheEnabled(true);
diff --git a/tests/auto/gui/text/text.pro b/tests/auto/gui/text/text.pro
index 5055ab61a3..6c0def4d63 100644
--- a/tests/auto/gui/text/text.pro
+++ b/tests/auto/gui/text/text.pro
@@ -3,6 +3,7 @@ SUBDIRS=\
    qabstracttextdocumentlayout \
    qcssparser \
    qfont \
+   qfontcache \
    qfontdatabase \
    qfontmetrics \
    qglyphrun \
@@ -27,6 +28,7 @@ contains(QT_CONFIG, OdfWriter):SUBDIRS += qzip qtextodfwriter
 win32:SUBDIRS -= qtextpiecetable
 
 !contains(QT_CONFIG, private_tests): SUBDIRS -= \
+           qfontcache \
            qcssparser \
            qstatictext \
            qtextlayout \
diff --git a/tests/auto/gui/util/qregularexpressionvalidator/.gitignore b/tests/auto/gui/util/qregularexpressionvalidator/.gitignore
new file mode 100644
index 0000000000..a4022144d5
--- /dev/null
+++ b/tests/auto/gui/util/qregularexpressionvalidator/.gitignore
@@ -0,0 +1 @@
+tst_qregularexpressionvalidator
diff --git a/tests/auto/gui/util/qregularexpressionvalidator/qregularexpressionvalidator.pro b/tests/auto/gui/util/qregularexpressionvalidator/qregularexpressionvalidator.pro
new file mode 100644
index 0000000000..1e8e50563e
--- /dev/null
+++ b/tests/auto/gui/util/qregularexpressionvalidator/qregularexpressionvalidator.pro
@@ -0,0 +1,4 @@
+CONFIG += testcase parallel_test
+TARGET = tst_qregularexpressionvalidator
+SOURCES += tst_qregularexpressionvalidator.cpp
+QT += testlib
diff --git a/tests/auto/gui/util/qregularexpressionvalidator/tst_qregularexpressionvalidator.cpp b/tests/auto/gui/util/qregularexpressionvalidator/tst_qregularexpressionvalidator.cpp
new file mode 100644
index 0000000000..61d26104bd
--- /dev/null
+++ b/tests/auto/gui/util/qregularexpressionvalidator/tst_qregularexpressionvalidator.cpp
@@ -0,0 +1,120 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QRegularExpressionValidator>
+#include <QtTest/QtTest>
+
+class tst_QRegularExpressionValidator : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void validate_data();
+    void validate();
+};
+
+Q_DECLARE_METATYPE(QValidator::State)
+
+void tst_QRegularExpressionValidator::validate_data()
+{
+    QTest::addColumn<QRegularExpression>("re");
+    QTest::addColumn<QString>("value");
+    QTest::addColumn<QValidator::State>("state");
+
+    QTest::newRow("data0") << QRegularExpression("[1-9]\\d{0,3}") << QString("0") << QValidator::Invalid;
+    QTest::newRow("data1") << QRegularExpression("[1-9]\\d{0,3}") << QString("12345") << QValidator::Invalid;
+    QTest::newRow("data2") << QRegularExpression("[1-9]\\d{0,3}") << QString("1") << QValidator::Acceptable;
+
+    QTest::newRow("data3") << QRegularExpression("\\S+") << QString("myfile.txt") << QValidator::Acceptable;
+    QTest::newRow("data4") << QRegularExpression("\\S+") << QString("my file.txt") << QValidator::Invalid;
+
+    QTest::newRow("data5") << QRegularExpression("[A-C]\\d{5}[W-Z]") << QString("a12345Z") << QValidator::Invalid;
+    QTest::newRow("data6") << QRegularExpression("[A-C]\\d{5}[W-Z]") << QString("A12345Z") << QValidator::Acceptable;
+    QTest::newRow("data7") << QRegularExpression("[A-C]\\d{5}[W-Z]") << QString("B12") << QValidator::Intermediate;
+
+    QTest::newRow("data8") << QRegularExpression("read\\S?me(\\.(txt|asc|1st))?") << QString("readme") << QValidator::Acceptable;
+    QTest::newRow("data9") << QRegularExpression("read\\S?me(\\.(txt|asc|1st))?") << QString("read me.txt") << QValidator::Invalid;
+    QTest::newRow("data10") << QRegularExpression("read\\S?me(\\.(txt|asc|1st))?") << QString("readm") << QValidator::Intermediate;
+
+    QTest::newRow("data11") << QRegularExpression("read\\S?me(\\.(txt|asc|1st))?") << QString("read me.txt") << QValidator::Invalid;
+    QTest::newRow("data12") << QRegularExpression("read\\S?me(\\.(txt|asc|1st))?") << QString("readm") << QValidator::Intermediate;
+
+    QTest::newRow("data13") << QRegularExpression("\\w\\d\\d") << QString("A57") << QValidator::Acceptable;
+    QTest::newRow("data14") << QRegularExpression("\\w\\d\\d") << QString("E5") << QValidator::Intermediate;
+    QTest::newRow("data15") << QRegularExpression("\\w\\d\\d") << QString("+9") << QValidator::Invalid;
+
+    QTest::newRow("empty01") << QRegularExpression() << QString() << QValidator::Acceptable;
+    QTest::newRow("empty02") << QRegularExpression() << QString("test") << QValidator::Acceptable;
+}
+
+void tst_QRegularExpressionValidator::validate()
+{
+    QFETCH(QRegularExpression, re);
+    QFETCH(QString, value);
+
+    QRegularExpressionValidator rv;
+
+    // setting the same regexp won't emit signals
+    const int signalCount = (rv.regularExpression() == re) ? 0 : 1;
+
+    QSignalSpy spy(&rv, SIGNAL(regularExpressionChanged(QRegularExpression)));
+    QSignalSpy changedSpy(&rv, SIGNAL(changed()));
+
+    rv.setRegularExpression(re);
+    QCOMPARE(rv.regularExpression(), re);
+
+    int pos = -1;
+    QValidator::State result = rv.validate(value, pos);
+
+    QTEST(result, "state");
+    if (result == QValidator::Invalid)
+        QCOMPARE(pos, value.length());
+    else
+        QCOMPARE(pos, -1); // ensure pos is not modified if validate returned Acceptable or Intermediate
+
+    QCOMPARE(spy.count(), signalCount);
+    QCOMPARE(changedSpy.count(), signalCount);
+}
+
+QTEST_GUILESS_MAIN(tst_QRegularExpressionValidator)
+
+#include "tst_qregularexpressionvalidator.moc"
diff --git a/tests/auto/gui/util/util.pro b/tests/auto/gui/util/util.pro
index a0963980c9..f2c4515dc2 100644
--- a/tests/auto/gui/util/util.pro
+++ b/tests/auto/gui/util/util.pro
@@ -4,4 +4,5 @@ SUBDIRS= \
     qdoublevalidator \
     qintvalidator \
     qregexpvalidator \
+    qregularexpressionvalidator \